about summary refs log tree commit diff
path: root/.github
diff options
context:
space:
mode:
authorzsloan2021-10-18 17:50:26 +0000
committerzsloan2021-10-18 17:50:26 +0000
commite36eaf0003a598bc5aa688803dd1b36c24a4c051 (patch)
treea59b7dadf02241575eb0774f97c6048e2425c053 /.github
parentbd421438f1f0b4de913fa40cd49cfcda27e6b16f (diff)
parent04f3d13aceeaec2e52b94037d59f08ed6dc6a8bb (diff)
downloadgenenetwork2-e36eaf0003a598bc5aa688803dd1b36c24a4c051.tar.gz
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into feature/remove_trait_creation_from_search
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/main.yml31
1 files changed, 15 insertions, 16 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a36abc0a..8e2c7966 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   unittest:
     runs-on: ubuntu-latest
-    container: bonfacekilz/python3-genenetwork2:ad741c1
+    container: bonfacekilz/genenetwork2:latest
 
     steps:
     # First start with mariadb set then checkout. The checkout gives
@@ -31,7 +31,7 @@ jobs:
       run: |
         /gn2-profile/bin/screen -dmLS redisconn /gn2-profile/bin/redis-server
 
-    # Redis is required by some of the tests 6379
+    # Initialise the tables
     - name: Bootstrap tables
       run: |
         mysql -u root -e "SHOW DATABASES;"
@@ -39,28 +39,27 @@ jobs:
         mysql -u root -e "CREATE USER 'gn2'@'localhost' IDENTIFIED BY 'mysql_password';"
         mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'gn2'@'localhost';FLUSH PRIVILEGES;"
 
-    - name: Run the unit tests
-      run: |
-        env GN2_PROFILE=/gn2-profile \
-        TMPDIR=/tmp SERVER_PORT=5004 \
-        WEBSERVER_MODE=DEBUG LOG_LEVEL=DEBUG \
-        GENENETWORK_FILES=/genotype_files/ bin/genenetwork2 \
-        etc/default_settings.py -c -m unittest discover -v
-
     - name: Start Genenetwork as a  Background Task
       run: |
-        env GN2_PROFILE=/gn2-profile \
+        /gn2-profile/bin/screen -dm bash -c "env GN2_PROFILE=/gn2-profile \
         TMPDIR=/tmp SERVER_PORT=5004 \
         WEBSERVER_MODE=DEBUG LOG_LEVEL=DEBUG \
         GENENETWORK_FILES=/genotype_files/ bin/genenetwork2 \
-        etc/default_settings.py&
+        etc/default_settings.py"
 
-    - name: Test for Broken Links
+    - name: Run the unit tests
       run: |
-
         env GN2_PROFILE=/gn2-profile \
-        TMPDIR=/tmp\
+        TMPDIR=/tmp SERVER_PORT=5004 \
         WEBSERVER_MODE=DEBUG LOG_LEVEL=DEBUG \
         GENENETWORK_FILES=/genotype_files/ bin/genenetwork2 \
-        etc/default_settings.py -c  /__w/genenetwork2/genenetwork2/test/requests/links_scraper/genelinks.py 
+        etc/default_settings.py -c -m unittest discover -v
 
+    # - name: Test for Broken Links
+    #   run: |
+    #     env GN2_PROFILE=/gn2-profile \
+    #     TMPDIR=/tmp\
+    #     WEBSERVER_MODE=DEBUG LOG_LEVEL=DEBUG \
+    #     GENENETWORK_FILES=/genotype_files/ bin/genenetwork2 \
+    #     etc/default_settings.py -c \
+    #     $PWD/test/requests/links_scraper/genelinks.py