Browse Source

test run cleanup

Steven Silvester 5 years ago
parent
commit
6c49c94dcb
2 changed files with 6 additions and 23 deletions
  1. 1 5
      package.json
  2. 5 18
      scripts/ci_script.sh

+ 1 - 5
package.json

@@ -74,11 +74,7 @@
     "remove:sibling": "node buildutils/lib/remove-package.js",
     "test": "lerna run test --scope \"@jupyterlab/*\" --concurrency 1 --stream",
     "test:all": "lerna run test --scope \"@jupyterlab/*\" --concurrency 1 --stream --no-bail",
-    "test:chrome": "lerna run test:chrome --scope \"@jupyterlab/*\" --concurrency 1 --stream",
-    "test:chrome-headless": "lerna run test:chrome-headless --scope \"@jupyterlab/*\" --concurrency 1 --stream",
     "test:examples": "python examples/test_examples.py",
-    "test:firefox": "lerna run test:firefox --scope \"@jupyterlab/*\" --concurrency 1 --stream",
-    "test:ie": "lerna run test:ie --scope \"@jupyterlab/*\" --concurrency 1 --stream",
     "test:scope": "lerna run test --concurrency 1 --stream",
     "test:summary": "lerna run test --scope \"@jupyterlab/test-*\" --parallel --no-bail | grep -Ei '.* test.*(failed|passed|total|completed|skipped)' | sort",
     "update:dependency": "node buildutils/lib/update-dependency.js --lerna",
@@ -89,7 +85,7 @@
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged",
-      "pre-push": "jlpm run integrity"
+      "pre-push": "jlpm run integrity --force"
     }
   },
   "dependencies": {},

+ 5 - 18
scripts/ci_script.sh

@@ -22,28 +22,15 @@ if [[ $GROUP == js* ]]; then
     if [[ $GROUP == js-* ]]; then
         # extract the group name
         export PKG="${GROUP#*-}"
-        jlpm run build:packages:scope --scope "@jupyterlab/$PKG"
-        here=$(pwd)
-        if [[ -d "${here}/tests/test-${GROUP}" ]];then
-            scope="@jupyterlab/test-${PKG}"
-            jlpm run build:test:scope --scope ${scope}
-        else
-            pushd packages/${PKG}
-            jlpm run build; true
-            if [[ -d ${here}/packages/${PKG}/test ]]; then
-                jlpm run build:test; true
-            fi
-            popd
-            scope="@jupyterlab/${PKG}"
-        fi
-
-        FORCE_COLOR=1 jlpm run test:scope --loglevel success --scope ${scope} ||  FORCE_COLOR=1 jlpm run test:scope --loglevel success --scope ${scope}
+        pushd packages/${PKG}
+        jlpm run build:test; true
+        CMD="FORCE_COLOR=1 jlpm run test:cov"
     else
         jlpm build:packages
         jlpm build:test
-        FORCE_COLOR=1 jlpm test --loglevel success
+        CMD="FORCE_COLOR=1 jlpm test:cov --loglevel success"
     fi
-
+    $CMD || $CMD || $CMD
     jlpm run clean
 fi