- Fix Travis tests

GeoNode · Mar 17, 2019 · d54cb85 · d54cb85
1 parent 03b2387
commit d54cb85
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,6 +37,7 @@ matrix:
             ON_TRAVIS: 'True'
             TEST_RUN_CORE: 'True'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'False'
     - name: "GeoServer-backend Contrib Apps Smoke Tests"
       python: 2.7
       virtualenv:
@@ -47,6 +48,7 @@ matrix:
             ON_TRAVIS: 'True'
             TEST_RUN_INTERNAL_APPS: 'True'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
     - name: "GeoServer-backend Integration Tests"
       python: 2.7
       virtualenv:
@@ -62,6 +64,7 @@ matrix:
             TEST_RUN_INTEGRATION_CSW: 'False'
             TEST_RUN_INTEGRATION_BDD: 'False'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
             CELERY_ALWAYS_EAGER: 'True'
     - name: "GeoServer-backend Integration CSW Tests"
       python: 2.7
@@ -78,6 +81,7 @@ matrix:
             TEST_RUN_INTEGRATION_CSW: 'True'
             TEST_RUN_INTEGRATION_BDD: 'False'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'False'
             CELERY_ALWAYS_EAGER: 'True'
     - name: "GeoServer-backend Integration BDD Tests"
       python: 2.7
@@ -94,6 +98,7 @@ matrix:
             TEST_RUN_INTEGRATION_CSW: 'False'
             TEST_RUN_INTEGRATION_BDD: 'True'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'False'
             CELERY_ALWAYS_EAGER: 'True'
     - name: "QGis Server-backend Core Modules Smoke Tests"
       python: 2.7
@@ -112,6 +117,7 @@ matrix:
             ON_TRAVIS: 'True'
             TEST_RUN_CORE: 'True'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'False'
             CELERY_ALWAYS_EAGER: 'True'
     - name: "QGis Server-backend Contrib Apps Smoke Tests"
       python: 2.7
@@ -130,6 +136,7 @@ matrix:
             ON_TRAVIS: 'True'
             TEST_RUN_INTERNAL_APPS: 'True'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'False'
             CELERY_ALWAYS_EAGER: 'True'
     - name: "QGis Server-backend Integration Tests"
       python: 2.7
@@ -148,6 +155,7 @@ matrix:
             ON_TRAVIS: 'True'
             TEST_RUN_INTEGRATION: 'True'
             MONITORING_ENABLED: 'False'
+            SESSION_EXPIRED_CONTROL_ENABLED: 'False'
             CELERY_ALWAYS_EAGER: 'True'
     - name: "Selenium Integration Tests"
       python: 3.5

diff --git a/geonode/geoserver/utils.py b/geonode/geoserver/utils.py
@@ -17,14 +17,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #########################################################################
-import logging
 import requests
-
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 
-logger = logging.getLogger(__name__)
-
 requests.packages.urllib3.disable_warnings()
 
 

diff --git a/geonode/security/middleware.py b/geonode/security/middleware.py
@@ -93,7 +93,7 @@ class SessionControlMiddleware(object):
         redirect_to = getattr(settings, 'LOGIN_URL', reverse('account_login'))
 
         def process_request(self, request):
-            if request and request.user:
+            if request and request.user and not request.user.is_anonymous:
                 if not request.user.is_active:
                     self.do_logout(request)
                 elif check_ogc_backend(geoserver.BACKEND_PACKAGE):

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -802,7 +802,7 @@
         'GEOGIG_ENABLED': False,
         'WMST_ENABLED': False,
         'BACKEND_WRITE_ENABLED': True,
-        'WPS_ENABLED': False,
+        'WPS_ENABLED': True,
         'LOG_FILE': '%s/geoserver/data/logs/geoserver.log'
         % os.path.abspath(os.path.join(PROJECT_ROOT, os.pardir)),
         # Set to name of database in DATABASES dictionary to enable

diff --git a/scripts/spcgeonode/docker-compose.yml b/scripts/spcgeonode/docker-compose.yml
@@ -33,6 +33,7 @@ x-common-django:
     - MEDIA_URL=/uploaded/
     - GEOSERVER_LOCATION=http://nginx/geoserver/
     - ASYNC_SIGNALS=True
+    - SESSION_EXPIRED_CONTROL_ENABLED=False
     # TODO : we should probably remove this and set Celery to use JSON serialization instead of pickle
     - C_FORCE_ROOT=True
     # We get an exception after migrations on startup (it seems the monitoring app tries to resolve the geoserver domain name after it's migration, which can happen before oauth migrations on which geoserver startup depends...)