- Fix Travis

GeoNode · Mar 19, 2019 · 70edba3 · 70edba3
1 parent 35c235c
commit 70edba3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -256,12 +256,6 @@ after_success:
   - bash <(curl -s https://codecov.io/bash) -t 2c0e7780-1640-45f0-93a3-e103b057d8c8
 
 notifications:
-  # irc:
-  #   channels:
-  #     - "irc.freenode.org#geonode"
-  #   use_notice: true
   email:
     - alessio.fabiani@gmail.com
-  #   - ingenieroariel@gmail.com
-  #   - simone.dalmasso@gmail.com
   slack: geonode-sprint:oQylJRkU9feZ8JruGi6czWwe
diff --git a/pavement.py b/pavement.py
@@ -794,12 +794,14 @@ def test(options):
     else:
         _apps = GEONODE_APPS
 
+    _apps_to_test = []
     for _app in _apps:
         if _app and len(_app) > 0 and 'geonode' in _app:
-            sh("%s manage.py test %s.tests --noinput %s %s" % (options.get('prefix'),
-                                                               _app,
-                                                               _keepdb,
-                                                               _parallel))
+            _apps_to_test.append(_app)
+    sh("%s manage.py test geonode.tests.smoke %s.tests --noinput %s %s" % (options.get('prefix'),
+                                                                           '.tests '.join(_apps_to_test),
+                                                                           _keepdb,
+                                                                           _parallel))
 
 
 @task
@@ -932,7 +934,6 @@ def run_tests(options):
     local = options.get('local', 'false')  # travis uses default to false
 
     if not integration_tests and not integration_csw_tests and not integration_bdd_tests:
-        sh('%s manage.py test geonode.tests.smoke %s %s' % (prefix, _keepdb, _parallel))
         call_task('test', options={'prefix': prefix})
     else:
         if integration_tests: