[GitHub] timifasubaa closed pull request #6241: Split cypress tests

[GitBox <gi...@apache.org>]

timifasubaa closed pull request #6241: Split cypress tests
URL: https://github.com/apache/incubator-superset/pull/6241
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 247f9e4058..cb7164d8e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,33 @@ jobs:
   include:
     - language: python
       python: 3.6
-      env: TOXENV=cypress
+      env: TOXENV=cypress-dashboard
+      cache:
+        pip: true
+        yarn: true
+        directories:
+          - ~/.npm
+          - ~/.cache
+      services:
+        - redis-server
+      before_install:
+        - nvm install 8.9
+    - language: python
+      python: 3.6
+      env: TOXENV=cypress-explore
+      cache:
+        pip: true
+        yarn: true
+        directories:
+          - ~/.npm
+          - ~/.cache
+      services:
+        - redis-server
+      before_install:
+        - nvm install 8.9
+    - language: python
+      python: 3.6
+      env: TOXENV=cypress-sqllab
       cache:
         pip: true
         yarn: true
diff --git a/cypress.json b/cypress.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/superset/assets/cypress.json b/superset/assets/cypress.json
index 872283cd5f..58ae32f855 100644
--- a/superset/assets/cypress.json
+++ b/superset/assets/cypress.json
@@ -1,8 +1,10 @@
 {
   "baseUrl": "http://localhost:8081",
   "videoUploadOnPasses": false,
+  "video": false,
   "ignoreTestFiles": ["**/!(*.test.js)"],
   "projectId": "fbf96q",
+  "defaultCommandTimeout": 10000,
   "viewportWidth": 1280,
   "viewportHeight": 800
 }
diff --git a/superset/assets/cypress_build.sh b/superset/assets/cypress_build.sh
index 9e72e9fce0..6925400adc 100755
--- a/superset/assets/cypress_build.sh
+++ b/superset/assets/cypress_build.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 set -e
 
-superset/bin/superset db upgrade
-superset/bin/superset load_test_users
-superset/bin/superset load_examples
-superset/bin/superset init
-flask run -p 8081 --with-threads --reload --debugger &
-
 cd "$(dirname "$0")"
 
-yarn install --frozen-lockfile
-npm run build
-npm run cypress run
+#run all the python steps in a background process
+(time /home/travis/build/apache/incubator-superset/superset/bin/superset db upgrade; time /home/travis/build/apache/incubator-superset/superset/bin/superset load_test_users; /home/travis/build/apache/incubator-superset/superset/bin/superset load_examples; time /home/travis/build/apache/incubator-superset/superset/bin/superset init; echo "[completed python build steps]"; flask run -p 8081 --with-threads --reload --debugger) &
+
+#block on the longer running javascript process
+(time yarn install --frozen-lockfile; time npm run build; echo "[completed js build steps]")
+
+CYPRESS_PATH='cypress/integration/'${1}'/*'
+time npm run cypress run -- --spec "$CYPRESS_PATH" --record false --config video=false
+
 kill %1
diff --git a/tox.ini b/tox.ini
index 53949a34c9..5014168c7f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,9 +45,31 @@ setenv =
 whitelist_externals =
     npm
 
-[testenv:cypress]
+[testenv:cypress-dashboard]
 commands =
-    {toxinidir}/superset/assets/cypress_build.sh
+    {toxinidir}/superset/assets/cypress_build.sh dashboard
+setenv =
+    PYTHONPATH = {toxinidir}
+    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_HOME = {envtmpdir}
+deps =
+    -rrequirements.txt
+    -rrequirements-dev.txt
+
+[testenv:cypress-explore]
+commands =
+    {toxinidir}/superset/assets/cypress_build.sh explore
+setenv =
+    PYTHONPATH = {toxinidir}
+    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_HOME = {envtmpdir}
+deps =
+    -rrequirements.txt
+    -rrequirements-dev.txt
+
+[testenv:cypress-sqllab]
+commands =
+    {toxinidir}/superset/assets/cypress_build.sh sqllab
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_CONFIG = tests.superset_test_config
@@ -83,7 +105,9 @@ deps =
 
 [tox]
 envlist =
-    cypress
+    cypress-dashboard
+    cypress-explore
+    cypress-sqllab
     eslint
     flake8
     javascript


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org