Move user install tests to after global origen install

Origen-SDK · Nov 13, 2023 · 1585119 · 1585119
1 parent 9af9274
commit 1585119
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/regression_test.yml b/.github/workflows/regression_test.yml
@@ -310,10 +310,6 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: mv rust/origen/target/debug/origen.exe python/origen/origen/__bin__/bin
 
-      - name: Run User-Global Invocation Tests
-        working-directory: test_apps/no_workspace
-        run: pytest test_user_install.py::TestUserInstall -vv
-
       # TODO GA: Regressions: not sure why, but the tmp directory in origen_metal causes some issues
       # For now, just removing it.
       - name: Remove origen_metal tmp Directory
@@ -338,6 +334,10 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: where.exe origen
 
+      - name: Run User-Global Invocation Tests
+        working-directory: test_apps/no_workspace
+        run: pytest test_user_install.py::TestUserInstall -vv
+
       # Should be no pyprojects in the root so far. Start with no-workspace tests
       - name: Run No-Workspace-No-Plugins Tests
         working-directory: test_apps/no_workspace

diff --git a/test_apps/no_workspace/test_user_install.py b/test_apps/no_workspace/test_user_install.py
@@ -12,6 +12,7 @@ def set_params(cls):
         cls.move_pyproject = False
         cls.invocation = PyProjectSrc.UserGlobal
         cls.file_based_evals = True
+        cls.cli_dir = cls.site_cli_dir
 
     @classmethod
     def setup_method(cls):