From: biao716.wang Date: Tue, 4 Jul 2023 06:15:20 +0000 (+0900) Subject: replace platform module to distro X-Git-Tag: accepted/tools/devbase/tools/20250527.103752~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dce65aa2282e6e2f965db1b329848cee79fe12c6;p=tools%2Fitest-cases-mic.git replace platform module to distro Change-Id: Ia5a0950def549069aa385893b3c360d371e2354d Signed-off-by: biao716.wang --- diff --git a/cases/create/func_cases/mic_cr_auto_raw.case b/cases/create/func_cases/mic_cr_auto_raw.case index 10595f1..f2dc65f 100755 --- a/cases/create/func_cases/mic_cr_auto_raw.case +++ b/cases/create/func_cases/mic_cr_auto_raw.case @@ -47,7 +47,7 @@ sudo bunzip2 -d mic-output/$bz2img raw_image=$(ls mic-output/ivi-*-sdb.raw) sudo mkdir -p mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) -distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()') +distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())') echo $distro if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then modprobe_path=$(sudo which modprobe) @@ -57,8 +57,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then sudo $rmmod_path loop fi -platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') -version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') +platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') +version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform"="openSUSE" ] && [ "$version"=42.3 ]; then #$raw_image_2=${raw_image##*/}"2" offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}') @@ -119,9 +119,9 @@ do test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) - linux_distro=$(python -c 'import platform; print platform.linux_distribution();') - platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') - version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') + linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());') + platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') + version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then echo 'This is openSUSE42.3 platform.' else diff --git a/cases/create/func_cases/mic_cr_auto_raw_gpt.case b/cases/create/func_cases/mic_cr_auto_raw_gpt.case index 364b1c1..7400ecd 100755 --- a/cases/create/func_cases/mic_cr_auto_raw_gpt.case +++ b/cases/create/func_cases/mic_cr_auto_raw_gpt.case @@ -26,7 +26,7 @@ sudo bunzip2 -d mic-output/$bz2img raw_image=$(ls mic-output/ivi_with_installerfw-*-sdb.raw) sudo mkdir -p mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) -distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()') +distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())') echo $distro if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then modprobe_path=$(sudo which modprobe) @@ -36,8 +36,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then sudo $rmmod_path loop fi -platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') -version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') +platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') +version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then #$raw_image_2=${raw_image##*/}"2" offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}') @@ -94,9 +94,9 @@ do test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) - linux_distro=$(python -c 'import platform; print platform.linux_distribution();') - platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') - version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') + linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());') + platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') + version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then echo 'This is openSUSE42.3 platform.' else diff --git a/cases/create/mixed_cases/mic_cr_createrepo_issue.case b/cases/create/mixed_cases/mic_cr_createrepo_issue.case index 6c68815..f354839 100755 --- a/cases/create/mixed_cases/mic_cr_createrepo_issue.case +++ b/cases/create/mixed_cases/mic_cr_createrepo_issue.case @@ -17,7 +17,7 @@ createrepo --version || True #export ftp_proxy="ftp://10.112.1.184:8080" #export socks_proxy="socks://10.112.1.184:8080" export no_proxy="localhost, 127.0.0.1, 10.113.136.113, ftp.kr.debian.org, 109.123.123.185, 10.113.136.26" -distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()') +distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())') echo $distro if [ "$distro" = "opensuse" ]; then sudo zypper install -y --oldpackage createrepo_c-0.10.4 diff --git a/cases/create/mixed_cases/mic_cr_raw_active_partition.case b/cases/create/mixed_cases/mic_cr_raw_active_partition.case index 7a66ea1..dd4bf65 100755 --- a/cases/create/mixed_cases/mic_cr_raw_active_partition.case +++ b/cases/create/mixed_cases/mic_cr_raw_active_partition.case @@ -21,7 +21,7 @@ cd mic-output/ raw_name=$(ls ivi_with_active_partition-*-sdb.raw) test -f $raw_name kpartx_path=$(sudo which kpartx) -distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()') +distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())') echo $distro if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then modprobe_path=$(sudo which modprobe) @@ -31,8 +31,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then sudo $rmmod_path loop fi -platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') -version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') +platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') +version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then echo 'This is openSUSE42.3 platform.' else @@ -44,9 +44,9 @@ blkid_output=$(sudo $blkid_path -L boot | sed 's/.*loop\([0-9]*\)p\([0-9]\)/\2/' parted_path=$(sudo which parted) parted_boot_output=$(sudo $parted_path $raw_name print| grep 'boot' | awk '{print $1}') test $blkid_output -eq $parted_boot_output -linux_distro=$(python -c 'import platform; print platform.linux_distribution();') -platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') -version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') +linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());') +platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') +version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then echo 'This is openSUSE42.3 platform.' elif [ !`echo $linux_distro | grep -E "openSUSE.*42.*"` ]; then diff --git a/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case b/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case index a64cafd..a9f13cf 100755 --- a/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case +++ b/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case @@ -10,7 +10,7 @@ python repo_parse.py ivi_with_installerfw.ks repo_config.json ivi-profile python repo_parse.py ivi_syslinux_problem.ks repo_config.json syslinux_problem_rep-profile platform=$(uname -m) -distro=$(python -c "import platform;print platform.linux_distribution()[0].lower().rstrip()") +distro=$(python3 -c "import distro;print(distro.linux_distribution()[0].lower().rstrip())") if [ "$platform" == "x86_64" ] || [ "$distro" == "centos" ] then losetup_path=$(sudo which losetup) diff --git a/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case b/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case index f83d934..99d377d 100755 --- a/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case +++ b/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case @@ -13,7 +13,7 @@ python repo_parse.py ivi_624.ks repo_config.json ivi-profile losetup_path=$(sudo which losetup) sudo $losetup_path -a loop_used_before=$(sudo $losetup_path -a | wc -l) -distro=`python -c "import platform;a=platform.linux_distribution();print a[0]"` +distro=`python3 -c "import distro;a=distro.linux_distribution();print(a[0])"` sudo mic -d -v cr raw ivi_624.ks --logfile=./log/handset.log test -f ./log/handset.log grep 'Finished' ./log/handset.log diff --git a/cases/create/mixed_cases/mic_cr_raw_locale.case b/cases/create/mixed_cases/mic_cr_raw_locale.case index 86fe497..99403ed 100755 --- a/cases/create/mixed_cases/mic_cr_raw_locale.case +++ b/cases/create/mixed_cases/mic_cr_raw_locale.case @@ -26,7 +26,7 @@ fi raw_image=$(ls mic-output/ivi-*-sdb.raw) sudo mkdir -p mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) -distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()') +distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())') echo $distro if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then modprobe_path=$(sudo which modprobe) @@ -36,8 +36,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then sudo $rmmod_path loop fi -platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') -version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') +platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') +version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if ([ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]) || ([ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]); then #$raw_image_2=${raw_image##*/}"2" offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}') @@ -89,9 +89,9 @@ if [ -f $raw_image ];then test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) - linux_distro=$(python -c 'import platform; print platform.linux_distribution();') - platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') - version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') + linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());') + platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') + version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then echo 'This is openSUSE42.3 platform.' elif [ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]; then diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case index a21d265..7f5b821 100755 --- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case +++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case @@ -22,7 +22,7 @@ fi raw_image=$(ls mic-output/ivi-*-sdb.raw) sudo mkdir -p mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) -distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()') +distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())') echo $distro if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then modprobe_path=$(sudo which modprobe) @@ -32,8 +32,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then sudo $rmmod_path loop fi -platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') -version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') +platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') +version=$(python3 -c 'import distro;print(platform.linux_distribution()[1].rstrip())') if ([ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]) || ([ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]); then #$raw_image_2=${raw_image##*/}"2" offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}') @@ -84,9 +84,9 @@ if [ -f $raw_image ];then test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) - linux_distro=$(python -c 'import platform; print platform.linux_distribution();') - platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') - version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') + linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());') + platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') + version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then echo 'This is openSUSE42.3 platform.' elif [ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]; then diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case index 269a9cc..03a826a 100755 --- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case +++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case @@ -22,7 +22,7 @@ fi raw_image=$(ls mic-output/ivi-*-sdb.raw) sudo mkdir -p mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) -distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()') +distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())') echo $distro if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then modprobe_path=$(sudo which modprobe) @@ -32,8 +32,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then sudo $rmmod_path loop fi -platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') -version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') +platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') +version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if ([ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]) || ([ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]); then #$raw_image_2=${raw_image##*/}"2" offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}') @@ -85,9 +85,9 @@ if [ -f $raw_image ];then test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot kpartx_path=$(sudo which kpartx) - linux_distro=$(python -c 'import platform; print platform.linux_distribution();') - platform=$(python -c 'import platform;print platform.linux_distribution()[0].rstrip()') - version=$(python -c 'import platform;print platform.linux_distribution()[1].rstrip()') + linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());') + platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())') + version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())') if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then echo 'This is openSUSE42.3 platform.' elif [ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]; then diff --git a/settings.py b/settings.py index 5d3ba2d..ccabd27 100644 --- a/settings.py +++ b/settings.py @@ -1,7 +1,6 @@ import re import os import random -import platform import subprocess from itest.utils import check_output @@ -27,7 +26,7 @@ def sample_files(path, k, predict=None): return [ files[i] for i in idx ] def is_bootstrap_file(case_path): - cases = subprocess.Popen('grep native %s' % (case_path), shell=True, stdout=subprocess.PIPE).communicate()[0] + cases = subprocess.Popen('grep native %s' % (case_path), shell=True, stdout=subprocess.PIPE).communicate()[0].decode() return cases == '' def random_tests(predict=None): @@ -55,7 +54,7 @@ def get_specific_cases(type): shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = proc.communicate() - cases = stdout.split() + cases = stdout.decode().split() for case in cases: full_path = os.path.join(CWD, case) cases[cases.index(case)] = full_path diff --git a/sudoers.itest_cases_mic b/sudoers.itest_cases_mic index 9a66af8..2ee8df3 100644 --- a/sudoers.itest_cases_mic +++ b/sudoers.itest_cases_mic @@ -14,7 +14,7 @@ Cmnd_Alias MOUNT = /bin/mount, /usr/bin/mount Cmnd_Alias LOSETUP = /sbin/losetup, /usr/sbin/losetup Cmnd_Alias PARTED = /sbin/parted, /usr/sbin/parted Cmnd_Alias BLKID = /sbin/blkid, /usr/sbin/blkid -Cmnd_Alias CHROOT = /usr/sbin/chroot, /usr/bin/chroot +Cmnd_Alias MICCHROOT = /usr/sbin/chroot, /usr/bin/chroot Cmnd_Alias CREATEREPO = /usr/bin/createrepo Cmnd_Alias XARGS = /usr/bin/xargs Cmnd_Alias GUNZIP = /bin/gunzip, /usr/bin/gunzip @@ -36,5 +36,5 @@ Cmnd_Alias YUM = /usr/bin/yum Cmnd_Alias ZYPPER = /usr/bin/zypper Cmnd_Alias APTGET = /usr/bin/apt-get Cmnd_Alias RPM = /usr/bin/rpm, /bin/rpm -build ALL=(ALL) NOPASSWD: MIC, TEST, RM, SETENFORCE, TAR, BUNZIP2, MKDIR, CHROOT, WHICH, KPARTX, MODPROBE, RMMOD, UMOUNT, MOUNT, LOSETUP, PARTED, CREATEREPO, XARGS, BLKID, EGREP, GUNZIP, UNZIP, MV, CP, SED, FDISK, SPM, LZOP, PYTHON, LS, MD5SUM, SHA1SUM, SHA256SUM, YUM, ZYPPER, APTGET, RPM,WGET +build ALL=(ALL) NOPASSWD: MIC, TEST, RM, SETENFORCE, TAR, BUNZIP2, MKDIR, MICCHROOT, WHICH, KPARTX, MODPROBE, RMMOD, UMOUNT, MOUNT, LOSETUP, PARTED, CREATEREPO, XARGS, BLKID, EGREP, GUNZIP, UNZIP, MV, CP, SED, FDISK, SPM, LZOP, PYTHON, LS, MD5SUM, SHA1SUM, SHA256SUM, YUM, ZYPPER, APTGET, RPM,WGET Defaults env_keep+="http_proxy https_proxy no_proxy"