Skip to content

Commit 269a718

Browse files
author
yangchenguang
committed
fix avocado-framewwork modify for PEP420
testcase run failed
1 parent c2ec376 commit 269a718

File tree

222 files changed

+222
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+222
-222
lines changed

Diff for: ‎cpu/cpuidle-latency.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from avocado import Test
2222
from avocado.utils import process
2323
from avocado.utils import build, distro, git
24-
from avocado.utils.software_manager import SoftwareManager
24+
from avocado.utils.software_manager.manager import SoftwareManager
2525

2626

2727
class Cpuidle_latency(Test):

Diff for: ‎cpu/cpupower_monitor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from avocado.utils import archive
2323
from avocado.utils import build, distro
2424
from avocado.utils import process, cpu
25-
from avocado.utils.software_manager import SoftwareManager
25+
from avocado.utils.software_manager.manager import SoftwareManager
2626

2727

2828
class CpupowerMonitor(Test):

Diff for: ‎cpu/cpustress.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from random import randint
2323
from avocado import Test
2424
from avocado.utils import process, cpu, distro
25-
from avocado.utils.software_manager import SoftwareManager
25+
from avocado.utils.software_manager.manager import SoftwareManager
2626

2727

2828
pids = []

Diff for: ‎cpu/dwh.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
from avocado import Test
2323
from avocado.utils import process, build, memory, distro, cpu
24-
from avocado.utils.software_manager import SoftwareManager
24+
from avocado.utils.software_manager.manager import SoftwareManager
2525

2626

2727
class Dwh(Test):

Diff for: ‎cpu/ebizzy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from avocado.utils import distro
2929
from avocado.utils import process
3030
from avocado.utils import build
31-
from avocado.utils.software_manager import SoftwareManager
31+
from avocado.utils.software_manager.manager import SoftwareManager
3232

3333

3434
class Ebizzy(Test):

Diff for: ‎cpu/em_cpufreq.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from avocado import Test
1919
from avocado import skipIf
2020
from avocado.utils import process, distro, cpu
21-
from avocado.utils.software_manager import SoftwareManager
21+
from avocado.utils.software_manager.manager import SoftwareManager
2222

2323
IS_POWER_NV = 'PowerNV' in open('/proc/cpuinfo', 'r').read()
2424

Diff for: ‎cpu/em_cpuidle.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from avocado import Test
2222
from avocado import skipIf
2323
from avocado.utils import process, distro, cpu
24-
from avocado.utils.software_manager import SoftwareManager
24+
from avocado.utils.software_manager.manager import SoftwareManager
2525

2626
IS_POWER_NV = 'PowerNV' in open('/proc/cpuinfo', 'r').read()
2727

Diff for: ‎cpu/em_cpupower.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from avocado import Test
2020
from avocado import skipIf
2121
from avocado.utils import process, distro
22-
from avocado.utils.software_manager import SoftwareManager
22+
from avocado.utils.software_manager.manager import SoftwareManager
2323

2424

2525
# TODO : Logic need to change when we have lib fix

Diff for: ‎cpu/em_quad_level_frequency_transitions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from avocado import Test
2525
from avocado.utils import process, distro, cpu, genio
2626
from avocado import skipIf
27-
from avocado.utils.software_manager import SoftwareManager
27+
from avocado.utils.software_manager.manager import SoftwareManager
2828

2929
IS_POWER_NV = 'PowerNV' not in open('/proc/cpuinfo', 'r').read()
3030

Diff for: ‎cpu/em_smt_folding_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from avocado import Test
2323
from avocado.utils import archive, build
2424
from avocado.utils import process, cpu, distro, genio
25-
from avocado.utils.software_manager import SoftwareManager
25+
from avocado.utils.software_manager.manager import SoftwareManager
2626

2727

2828
class SmtFolding(Test):

Diff for: ‎cpu/linsched.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from avocado import Test
2222
from avocado.utils import process, archive, build
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
class Linsched(Test):

Diff for: ‎cpu/numactl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from avocado import Test
2222
from avocado.utils import archive, build, process, distro, memory
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
class Numactl(Test):

Diff for: ‎cpu/numatop.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from avocado import Test, skipIf
2222
from avocado.utils import archive, build, process, distro, cpu
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525
IS_POWER10 = 'POWER10' in open('/proc/cpuinfo', 'r').read()
2626

Diff for: ‎cpu/pmqa.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from avocado import Test
2222
from avocado import skipIf
2323
from avocado.utils import process, git
24-
from avocado.utils.software_manager import SoftwareManager
24+
from avocado.utils.software_manager.manager import SoftwareManager
2525

2626
IS_POWER_NV = 'PowerNV' in open('/proc/cpuinfo', 'r').read()
2727

Diff for: ‎cpu/ppc64_cpu_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from avocado.utils import cpu
2525
from avocado.utils import distro
2626
from avocado.utils import genio
27-
from avocado.utils.software_manager import SoftwareManager
27+
from avocado.utils.software_manager.manager import SoftwareManager
2828
from math import ceil
2929

3030

Diff for: ‎cpu/producer_consumer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from avocado import Test
2323
from avocado.utils import process
2424
from avocado.utils import build, distro, git
25-
from avocado.utils.software_manager import SoftwareManager
25+
from avocado.utils.software_manager.manager import SoftwareManager
2626

2727

2828
class Producer_Consumer(Test):

Diff for: ‎cpu/pvr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from avocado import Test
2323
from avocado.utils import process
2424
from avocado.utils import genio
25-
from avocado.utils.software_manager import SoftwareManager
25+
from avocado.utils.software_manager.manager import SoftwareManager
2626
from avocado.utils import distro
2727

2828

Diff for: ‎cpu/schbench.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from avocado import Test
2121
from avocado.utils import process
2222
from avocado.utils import build, distro, git
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
class Schbench(Test):

Diff for: ‎cpu/sensors.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from avocado import Test
2222
from avocado import skipIf
2323
from avocado.utils import process, linux_modules, distro
24-
from avocado.utils.software_manager import SoftwareManager
24+
from avocado.utils.software_manager.manager import SoftwareManager
2525

2626
# TODO: Add possible errors of sensors command
2727
ERRORS = ['I/O error']

Diff for: ‎fs/blktests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from avocado import Test
2020
from avocado.utils import process, build, archive, genio, distro
21-
from avocado.utils.software_manager import SoftwareManager
21+
from avocado.utils.software_manager.manager import SoftwareManager
2222

2323

2424
class Blktests(Test):

Diff for: ‎fs/filebench.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from avocado import Test
2222
from avocado.utils import process, archive, build
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
class Filebench(Test):

Diff for: ‎fs/flail.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from avocado import Test
2020
from avocado.utils import process, build, archive
21-
from avocado.utils.software_manager import SoftwareManager
21+
from avocado.utils.software_manager.manager import SoftwareManager
2222

2323

2424
class Flail(Test):

Diff for: ‎fs/fs-fuzz.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from avocado import Test
2222
from avocado.utils import process, archive, build
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
class FsFuzz(Test):

Diff for: ‎fs/fsx.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import os
1717
from avocado import Test
1818
from avocado.utils import process, genio
19-
from avocado.utils.software_manager import SoftwareManager
19+
from avocado.utils.software_manager.manager import SoftwareManager
2020
from avocado.utils.partition import Partition
2121

2222

Diff for: ‎fs/pjdfstest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from avocado import Test
2222
from avocado.utils import process, archive, build
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
class Pjdfstest(Test):

Diff for: ‎fs/xfstests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from avocado.utils import process, build, git, distro, partition
3131
from avocado.utils import disk, data_structures, pmem
3232
from avocado.utils import genio
33-
from avocado.utils.software_manager import SoftwareManager
33+
from avocado.utils.software_manager.manager import SoftwareManager
3434

3535

3636
class Xfstests(Test):

Diff for: ‎fuzz/fsfuzzer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
from avocado import Test
2626
from avocado.utils import archive, build, distro, process
27-
from avocado.utils.software_manager import SoftwareManager
27+
from avocado.utils.software_manager.manager import SoftwareManager
2828

2929

3030
class Fsfuzzer(Test):

Diff for: ‎fuzz/trinity.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from avocado import Test
2222
from avocado.utils import archive, build, process
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
class Trinity(Test):

Diff for: ‎generic/connectathon.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from avocado.utils import process
2626
from avocado.utils import build
2727
from avocado.utils import git
28-
from avocado.utils.software_manager import SoftwareManager
28+
from avocado.utils.software_manager.manager import SoftwareManager
2929
from avocado.utils import distro
3030

3131

Diff for: ‎generic/criu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from avocado.utils import distro
2222
from avocado.utils import process
2323
from avocado.utils import genio
24-
from avocado.utils.software_manager import SoftwareManager
24+
from avocado.utils.software_manager.manager import SoftwareManager
2525

2626

2727
class CRIU(Test):

Diff for: ‎generic/cxl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import os
1818
from avocado import Test
1919
from avocado.utils import build, git, process
20-
from avocado.utils.software_manager import SoftwareManager
20+
from avocado.utils.software_manager.manager import SoftwareManager
2121

2222

2323
class Cxl(Test):

Diff for: ‎generic/htx_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import time
2323
import shutil
2424
from avocado import Test
25-
from avocado.utils.software_manager import SoftwareManager
25+
from avocado.utils.software_manager.manager import SoftwareManager
2626
from avocado.utils import build
2727
from avocado.utils import process, archive
2828
from avocado.utils import distro

Diff for: ‎generic/interbench.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from avocado.utils import archive
2525
from avocado.utils import process
2626
from avocado.utils import build, disk, memory
27-
from avocado.utils.software_manager import SoftwareManager
27+
from avocado.utils.software_manager.manager import SoftwareManager
2828

2929

3030
class Interbench(Test):

Diff for: ‎generic/ipistorm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from avocado import Test
2424
from avocado import skipIf
2525
from avocado.utils import archive, build, cpu, genio, linux_modules, process
26-
from avocado.utils.software_manager import SoftwareManager
26+
from avocado.utils.software_manager.manager import SoftwareManager
2727

2828
IS_POWER_NV = 'PowerNV' in genio.read_file('/proc/cpuinfo')
2929

Diff for: ‎generic/ltp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from avocado.utils import process, archive
2727
from avocado.utils.partition import Partition
2828

29-
from avocado.utils.software_manager import SoftwareManager
29+
from avocado.utils.software_manager.manager import SoftwareManager
3030

3131

3232
def clear_dmesg():

Diff for: ‎generic/openblas.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from avocado import Test
2121
from avocado.utils import build
2222
from avocado.utils import archive, process, cpu
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424
from avocado.utils import distro
2525

2626

Diff for: ‎generic/rcutorture.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from avocado.utils import process, cpu
2828
from avocado.utils import linux_modules
2929
from avocado.utils import distro
30-
from avocado.utils.software_manager import SoftwareManager
30+
from avocado.utils.software_manager.manager import SoftwareManager
3131

3232

3333
class Rcutorture(Test):

Diff for: ‎generic/service_check.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from avocado.utils.service import SpecificServiceManager
2525
from avocado.utils import distro
2626
from avocado.utils.wait import wait_for
27-
from avocado.utils.software_manager import SoftwareManager
27+
from avocado.utils.software_manager.manager import SoftwareManager
2828

2929

3030
class service_check(Test):

Diff for: ‎generic/stress-ng.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import multiprocessing
2121
from avocado import Test
2222
from avocado.utils import process, build, archive, distro, memory
23-
from avocado.utils.software_manager import SoftwareManager
23+
from avocado.utils.software_manager.manager import SoftwareManager
2424

2525

2626
def clear_dmesg():

Diff for: ‎generic/stress.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from avocado.utils import build
2929
from avocado.utils import memory
3030
from avocado.utils import process
31-
from avocado.utils.software_manager import SoftwareManager
31+
from avocado.utils.software_manager.manager import SoftwareManager
3232

3333

3434
class Stress(Test):

Diff for: ‎generic/stressapptest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import os
1818
from avocado import Test
1919
from avocado.utils import archive, build, cpu, memory, process, distro
20-
from avocado.utils.software_manager import SoftwareManager
20+
from avocado.utils.software_manager.manager import SoftwareManager
2121

2222

2323
class StressAppTest(Test):

Diff for: ‎generic/sysbench.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import shutil
1919
from avocado import Test
2020
from avocado.utils import process, git
21-
from avocado.utils.software_manager import SoftwareManager
21+
from avocado.utils.software_manager.manager import SoftwareManager
2222

2323

2424
class Sysbench(Test):

Diff for: ‎gpu/gpu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import shutil
1919
from avocado import Test, skipUnless
2020
from avocado.utils import build, process, distro, git
21-
from avocado.utils.software_manager import SoftwareManager
21+
from avocado.utils.software_manager.manager import SoftwareManager
2222

2323
IS_POWER_NV = 'PowerNV' in open('/proc/cpuinfo', 'r').read()
2424
IS_POWER9 = 'POWER9' in open('/proc/cpuinfo', 'r').read()

Diff for: ‎io/common/distro_tools.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from avocado import Test
2222
from avocado.utils import process
2323
from avocado.utils import pci
24-
from avocado.utils.software_manager import SoftwareManager
24+
from avocado.utils.software_manager.manager import SoftwareManager
2525

2626

2727
class DisrtoTool(Test):

0 commit comments

Comments
 (0)