chore(prysk): switch to pytest in CI

vercel · Dec 10, 2024 · 1031e0e · 1031e0e
1 parent b00654d
commit 1031e0e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/turborepo-test.yml b/.github/workflows/turborepo-test.yml
@@ -62,7 +62,7 @@ jobs:
           key: prysk-venv-${{ matrix.os.runner }}
 
       - name: Integration Tests
-        run: turbo run test --filter=turborepo-tests-integration --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }}
+        run: turbo run test:parallel --filter=turborepo-tests-integration --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }}
 
   examples:
     name: Turborepo Examples

diff --git a/packages/prysk/index.mjs b/packages/prysk/index.mjs
@@ -18,7 +18,11 @@ execSync(`python3 -m venv ${VENV_NAME}`);
 execSync(`${getVenvBin("python3")} -m pip install --quiet --upgrade pip`);
 
 // Install prysk
-execSync(`${getVenvBin("pip")} install "prysk==0.15.2"`);
+execSync(
+  `${getVenvBin(
+    "pip"
+  )} install "pytest==8.3.3" "prysk[pytest-plugin]==0.3.0" "pytest-xdist==3.6.1"`
+);
 
 // Which tests do we want to run?
 const testArg = process.argv[3] ? process.argv[3] : process.argv[2];
@@ -29,12 +33,12 @@ if (!tests) {
 }
 
 const flags = [
-  "--shell=bash",
+  "--pytest-shell=bash",
   process.env.PRYSK_INTERACTIVE === "true" ? "--interactive" : "",
-  isWindows ? "--dos2unix" : "",
+  isWindows ? "--pytest-dos2unix" : "",
 ].join(" ");
 
-const cmd = [getVenvBin("prysk"), flags, tests].join(" ");
+const cmd = [getVenvBin("pytest"), flags, tests].join(" ");
 console.log(`Running ${cmd}`);
 
 try {
@@ -47,7 +51,7 @@ try {
 }
 
 function getVenvBin(tool) {
-  const allowedVenvTools = ["python3", "pip", "prysk"];
+  const allowedVenvTools = ["python3", "pip", "pytest"];
   if (!allowedVenvTools.includes(tool)) {
     throw new Error(`Tool not allowed: ${tool}`);
   }

diff --git a/turborepo-tests/integration/package.json b/turborepo-tests/integration/package.json
@@ -4,8 +4,7 @@
     "test": "prysk tests",
     "clean": "rm -rf tests/**/*.t.err",
     "test:interactive": "PRYSK_INTERACTIVE=true prysk tests",
-    "test:parallel": ".cram_env/bin/pytest --prysk-shell='bash'",
-    "pretest:parallel": ".cram_env/bin/pip3 install --quiet pytest \"prysk[pytest-plugin]\" pytest-xdist"
+    "test:parallel": "prysk --prysk-shell='bash'"
   },
   "dependencies": {
     "turborepo-tests-helpers": "workspace:*",

diff --git a/turborepo-tests/integration/turbo.json b/turborepo-tests/integration/turbo.json
@@ -9,6 +9,10 @@
     "test": {
       "dependsOn": ["cli#build", "topo", "^build"],
       "passThroughEnv": ["CI"]
+    },
+    "test:parallel": {
+      "dependsOn": ["cli#build", "topo", "^build"],
+      "passThroughEnv": ["CI"]
     }
   }
 }