Merge pull request #5597 from stephenchengCloud/private/stephenche/me…

…rge_unittest_into_tests Merge python3/unittest into python3/tests
xapi-project · Apr 29, 2024 · 97aa0e0 · 97aa0e0
2 parents dabc634 + fdc9c08
commit 97aa0e0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -214,7 +214,7 @@ coverage:
  tests:
  # Ensure that all tests are executed (tests themselves must be 100% covered)
  target: 98%
- paths: ["python3/unittest/test_*.py"]
+ paths: ["python3/tests/test_*.py"]
 
 
 #
@@ -266,5 +266,5 @@ component_management:
 
  - component_id: test_cases
  name: test_cases
- paths: ["python3/unittest/test_*.py"]
+ paths: ["python3/tests/test_*.py"]
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,7 +73,7 @@ jobs:
  run: >
  pytest
  --cov=python3/
- python3/unittest python3/tests -vv -rA
+ python3/tests -vv -rA
  --junitxml=.git/pytest${{matrix.python-version}}.xml
  --cov-report term-missing
  --cov-report xml:.git/coverage${{matrix.python-version}}.xml

diff --git a/python3/unittest/test_hfx_filename.py → python3/tests/test_hfx_filename.py b/python3/unittest/test_hfx_filename.py → python3/tests/test_hfx_filename.py
diff --git a/python3/unittest/test_nbd_client_manager.py → python3/tests/test_nbd_client_manager.py b/python3/unittest/test_nbd_client_manager.py → python3/tests/test_nbd_client_manager.py
diff --git a/python3/unittest/test_perfmon.py → python3/tests/test_perfmon.py b/python3/unittest/test_perfmon.py → python3/tests/test_perfmon.py
diff --git a/python3/unittest/test_usb_scan.py → python3/tests/test_usb_scan.py b/python3/unittest/test_usb_scan.py → python3/tests/test_usb_scan.py
@@ -13,10 +13,11 @@
 import mock
 
 from python3.tests.import_helper import import_file_as_module
-
+# mock modules to avoid dependencies
 sys.modules["xcp"] = mock.Mock()
 sys.modules["xcp.logger"] = mock.Mock()
 sys.modules["pyudev"] = mock.Mock()
+usb_scan = import_file_as_module("python3/libexec/usb_scan.py")
 
 
 class MocDeviceAttrs(Mapping):
@@ -112,7 +113,6 @@ def verify_usb_common(
  # Use relative path to allow tests to be started in subdirectories
  path = os.path.dirname(__file__) + "/../../scripts/usb-policy.conf"
  ):
- usb_scan = import_file_as_module("python3/libexec/usb_scan.py")
 
  mock_setup(usb_scan, moc_devices, moc_interfaces, path)