Merge pull request #33 from clebergnu/lint_avoid_conflicts

Reorg module metadata and test directory to avoid namespace clashes
avocado-framework · Dec 3, 2024 · e806e53 · e806e53
2 parents f7c01cf + a90c81c
commit e806e53
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/modules-tests.yml b/.github/workflows/modules-tests.yml
@@ -15,7 +15,7 @@ jobs:
         run: pip3 install 'avocado-framework<104.0'
 
       - name: Run the ar module test
-        run: ./tests/test_module.py metadata/autils/archive/ar.yml
+        run: ./tests/test_module.py metadata/archive/ar.yml
 
   static-checks:
     runs-on: ubuntu-latest
@@ -26,6 +26,9 @@ jobs:
       - name: Install Avocado to allow for lint check on Python code under tests directory
         run: pip3 install 'avocado-framework<104.0'
 
+      - name: Include autils directory from source tree into Python's PATH
+        run: pip3 install .
+
       - name: run static checks
         uses: avocado-framework/avocado-ci-tools@main
         with:
@@ -55,5 +58,5 @@ jobs:
 
       - name: Run API stability tests
         if: steps.test_changes.outcome == 'failure'
-        run: ./tests/test_module.py metadata/autils/archive/ar.yml
+        run: ./tests/test_module.py metadata/archive/ar.yml
 
diff --git a/metadata/autils/archive/ar.yml → metadata/archive/ar.yml b/metadata/autils/archive/ar.yml → metadata/archive/ar.yml
@@ -12,5 +12,5 @@ supported_platforms:
   - Fedora 36
   - Fedora 37
 tests:
-  - tests/autils/archive/ar.py
+  - tests/modules/archive/ar.py
 remote: false
diff --git a/tests/autils/archive/ar.py → tests/modules/archive/ar.py b/tests/autils/archive/ar.py → tests/modules/archive/ar.py
diff --git a/tests/autils/archive/ar.py.data/guaca.a → tests/modules/archive/ar.py.data/guaca.a b/tests/autils/archive/ar.py.data/guaca.a → tests/modules/archive/ar.py.data/guaca.a
diff --git a/tests/autils/archive/ar.py.data/hello.deb → tests/modules/archive/ar.py.data/hello.deb b/tests/autils/archive/ar.py.data/hello.deb → tests/modules/archive/ar.py.data/hello.deb
diff --git a/tests/autils/archive/ar.py.data/hello.rpm → tests/modules/archive/ar.py.data/hello.rpm b/tests/autils/archive/ar.py.data/hello.rpm → tests/modules/archive/ar.py.data/hello.rpm