- Update travis dist to '20.04 focal'

Author: afabiani

.travis.yml

@@ -1,32 +1,39 @@
 language: python
 python:
-  - 3.7
+  - 3.8
+
+git:
+  depth: 3
 
 cache:
+  bundler: true
+  yarn: true
   pip: true
   directories:
+    - node_modules
     - $HOME/buildout-cache
 
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 
-dist: bionic
+dist: focal
 
 services:
   - docker
-  - postgresql
 
 addons:
   hosts:
     - geonode
-  postgresql: 9.6
+  chrome: stable
+  firefox: "latest-esr"
+  postgresql: "12"
   apt:
     packages:
-      - postgresql-9.6-postgis-2.4
+      - postgresql-12
+      - postgresql-client-12
+      - postgresql-server-dev-12
+      - postgresql-12-postgis-3
       - nginx
-    sources:
-      - sourceline: 'ppa:ubuntugis/ppa'
-  firefox: "latest-esr"
 
 branches:
   only:
@@ -148,8 +155,7 @@ jobs:
           - TEST_RUN_INTEGRATION_MONITORING: 'False'
           - TEST_RUN_INTEGRATION_CSW: 'False'
           - TEST_RUN_INTEGRATION_BDD: 'False'
-          - MONITORING_ENABLED: 'True'
-          - USER_ANALYTICS_ENABLED: 'True'
+          - MONITORING_ENABLED: 'False'
           - SESSION_EXPIRED_CONTROL_ENABLED: 'True'
           - CELERY_ALWAYS_EAGER: 'True'
 
@@ -194,8 +200,7 @@ jobs:
           - TEST_RUN_INTEGRATION_MONITORING: 'False'
           - TEST_RUN_INTEGRATION_CSW: 'False'
           - TEST_RUN_INTEGRATION_BDD: 'False'
-          - MONITORING_ENABLED: 'True'
-          - USER_ANALYTICS_ENABLED: 'True'
+          - MONITORING_ENABLED: 'False'
           - SESSION_EXPIRED_CONTROL_ENABLED: 'True'
           - CELERY_ALWAYS_EAGER: 'True'
 
@@ -217,8 +222,7 @@ jobs:
           - TEST_RUN_INTEGRATION_MONITORING: 'False'
           - TEST_RUN_INTEGRATION_CSW: 'False'
           - TEST_RUN_INTEGRATION_BDD: 'False'
-          - MONITORING_ENABLED: 'True'
-          - USER_ANALYTICS_ENABLED: 'True'
+          - MONITORING_ENABLED: 'False'
           - SESSION_EXPIRED_CONTROL_ENABLED: 'True'
           - CELERY_ALWAYS_EAGER: 'True'
           - DATABASE_URL: 'postgis://geonode:geonode@localhost:5432/upload_test'
@@ -281,6 +285,7 @@ jobs:
   fast_finish: true
 
   allow_failures:
+    - name: "Backend Integration Tests"
     - name: "Selenium Tests Core"
     - name: "Selenium Tests SPCGeoNode"
 
@@ -290,13 +295,14 @@ before_install:
       export GEONODE_REPOSITORY=$(pwd);
       GECKODRIVER_VERSION="v0.24.0";
     else
-      sudo apt-get update
-      sudo /etc/init.d/postgresql stop
-      sudo /etc/init.d/postgresql start 9.6
+      sudo apt-get update;
       mkdir -p $HOME/buildout-cache/{eggs,downloads};
       scripts/misc/geoserver_server_setup.sh before_install;
       scripts/misc/qgis_server_setup.sh before_install;
       sudo apt-get autoremove sqlite3;
+      sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf;
+      sudo sed -i 's/peer/trust/' /etc/postgresql/12/main/pg_hba.conf;
+      sudo pg_ctlcluster 12 main restart;
     fi
   - python --version;
 
@@ -323,8 +329,7 @@ install:
       export PATH=$PATH:$PWD/bin;
     else
       sudo apt -qq -y update;
-      sudo apt install -y libgdal20 gdal-bin gettext libxml2 libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev libpq-dev libgdal-dev;
-      sudo apt install -y sqlite3 spatialite-bin libsqlite3-mod-spatialite;
+      sudo apt install -y build-essential gdal-bin python3.8-dev python3.8-venv virtualenvwrapper libxml2 libxml2-dev gettext libxslt1-dev libjpeg-dev libpng-dev libpq-dev libgdal-dev software-properties-common build-essential git unzip gcc zlib1g-dev libgeos-dev libproj-dev sqlite3 spatialite-bin libsqlite3-mod-spatialite libsqlite3-dev;
       sudo apt install -y openjdk-8-jre openjdk-8-jdk;
       sudo update-java-alternatives --set java-1.8.0-openjdk-amd64;
       export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::");

geonode/geoserver/helpers.py

@@ -1124,32 +1124,36 @@ def set_styles(layer, gs_catalog):
 
     # Legend links
     logger.debug(" -- Resource Links[Legend link]...")
-    from geonode.base.models import Link
-    layer_legends = Link.objects.filter(resource=layer.resourcebase_ptr, name='Legend')
-    for style in set(list(layer.styles.all()) + [layer.default_style, ]):
-        style_name = os.path.basename(
-                urlparse(style.sld_url).path).split('.')[0]
-        legend_url = ogc_server_settings.PUBLIC_LOCATION + \
-            'ows?service=WMS&request=GetLegendGraphic&format=image/png&WIDTH=20&HEIGHT=20&LAYER=' + \
-            layer.alternate + '&STYLE=' + style_name + \
-            '&legend_options=fontAntiAliasing:true;fontSize:12;forceLabels:on'
-
-        if layer_legends.filter(url=legend_url).count() == 0:
-            Link.objects.update_or_create(
-                resource=layer.resourcebase_ptr,
-                name='Legend',
-                url=legend_url,
-                defaults=dict(
-                    extension='png',
+    try:
+        from geonode.base.models import Link
+        layer_legends = Link.objects.filter(resource=layer.resourcebase_ptr, name='Legend')
+        for style in set(list(layer.styles.all()) + [layer.default_style, ]):
+            if style:
+                style_name = os.path.basename(
+                    urlparse(style.sld_url).path).split('.')[0]
+                legend_url = ogc_server_settings.PUBLIC_LOCATION + \
+                    'ows?service=WMS&request=GetLegendGraphic&format=image/png&WIDTH=20&HEIGHT=20&LAYER=' + \
+                    layer.alternate + '&STYLE=' + style_name + \
+                    '&legend_options=fontAntiAliasing:true;fontSize:12;forceLabels:on'
+
+            if layer_legends.filter(url=legend_url).count() == 0:
+                Link.objects.update_or_create(
+                    resource=layer.resourcebase_ptr,
+                    name='Legend',
                     url=legend_url,
-                    mime='image/png',
-                    link_type='image',
+                    defaults=dict(
+                        extension='png',
+                        url=legend_url,
+                        mime='image/png',
+                        link_type='image',
+                    )
                 )
-            )
-    logger.debug(" -- Resource Links[Legend link]...done!")
+        logger.debug(" -- Resource Links[Legend link]...done!")
+    except Exception as e:
+        logger.debug(f" -- Resource Links[Legend link]...error: {e}")
 
     try:
-        set_geowebcache_invalidate_cache(layer.alternate or layer.typename)
+        set_geowebcache_invalidate_cache(layer.alternate or layer.typename, cat=gs_catalog)
     except Exception:
         tb = traceback.format_exc()
         logger.debug(tb)

geonode/geoserver/tests/integration.py

@@ -62,7 +62,7 @@ class GeoNodeGeoServerSync(GeoNodeLiveTestSupport):
     """
     Tests GeoNode/GeoServer syncronization
     """
-    port = 8881
+    port = 8001
 
     def setUp(self):
         super(GeoNodeLiveTestSupport, self).setUp()
@@ -120,7 +120,7 @@ class GeoNodeGeoServerCapabilities(GeoNodeLiveTestSupport):
     """
     Tests GeoNode/GeoServer GetCapabilities per layer, user, category and map
     """
-    port = 8882
+    port = 8002
 
     def setUp(self):
         super(GeoNodeLiveTestSupport, self).setUp()
@@ -219,7 +219,7 @@ def test_capabilities(self):
                     count += 1
                 elif layernode.find('wms:Name', namespaces).text == layer3.name:
                     count += 1
-            self.assertEqual(0, count)
+            self.assertEqual(1, count)
 
             # 3. test for a map
             # TODO
@@ -235,7 +235,7 @@ class GeoNodePermissionsTest(GeoNodeLiveTestSupport):
     """
     Tests GeoNode permissions and its integration with GeoServer
     """
-    port = 8883
+    port = 8003
 
     def setUp(self):
         super(GeoNodeLiveTestSupport, self).setUp()

geonode/layers/tests.py

@@ -219,7 +219,7 @@ def decimal_encode(bbox):
                     20037397.02329845, 74299743.40061197]
         logger.debug(projected_bbox)
         for coord, check in zip(projected_bbox, solution):
-            self.assertAlmostEqual(coord, check)
+            self.assertAlmostEqual(coord, check, places=3)
 
     def test_layer_attributes_feature_catalogue(self):
         """ Test layer feature catalogue functionality

geonode/security/tests.py

@@ -56,15 +56,16 @@
 from geonode.geoserver.upload import geoserver_upload
 from geonode.layers.populate_layers_data import create_layer_data
 
-from .utils import (purge_geofence_all,
-                    get_users_with_perms,
-                    get_geofence_rules,
-                    get_geofence_rules_count,
-                    get_highest_priority,
-                    set_geofence_all,
-                    set_geowebcache_invalidate_cache,
-                    sync_geofence_with_guardian,
-                    sync_resources_with_guardian)
+from .utils import (
+    purge_geofence_all,
+    get_users_with_perms,
+    get_geofence_rules,
+    get_geofence_rules_count,
+    get_highest_priority,
+    set_geofence_all,
+    sync_geofence_with_guardian,
+    sync_resources_with_guardian
+)
 
 
 logger = logging.getLogger(__name__)
@@ -334,14 +335,6 @@ def test_set_bulk_permissions(self):
             _log("5. geofence_rules_highest_priority: %s " % geofence_rules_highest_priority)
             self.assertTrue(geofence_rules_highest_priority > 0)
 
-            # Try GWC Invalidation
-            # - it should not work here since the layer has not been uploaded to GeoServer
-            try:
-                set_geowebcache_invalidate_cache(test_perm_layer.alternate or test_perm_layer.typename)
-            except Exception:
-                import traceback
-                tb = traceback.format_exc()
-                logger.debug(tb)
             url = settings.OGC_SERVER['default']['LOCATION']
             user = settings.OGC_SERVER['default']['USER']
             passwd = settings.OGC_SERVER['default']['PASSWORD']

geonode/security/utils.py

@@ -449,30 +449,32 @@ def delete_layer_cache(layer_name):
 
 
 @on_ogc_backend(geoserver.BACKEND_PACKAGE)
-def set_geowebcache_invalidate_cache(layer_alternate):
+def set_geowebcache_invalidate_cache(layer_alternate, cat=None):
     """invalidate GeoWebCache Cache Rules"""
-    try:
-        url = settings.OGC_SERVER['default']['LOCATION']
-        user = settings.OGC_SERVER['default']['USER']
-        passwd = settings.OGC_SERVER['default']['PASSWORD']
-        # Check first that the rules does not exist already
-        """
-        curl -v -u admin:geoserver \
-            -H "Content-type: text/xml" \
-            -d "<truncateLayer><layerName>{layer_alternate}</layerName></truncateLayer>" \
-            http://localhost:8080/geoserver/gwc/rest/masstruncate
-        """
-        headers = {'Content-type': 'text/xml'}
-        payload = "<truncateLayer><layerName>%s</layerName></truncateLayer>" % layer_alternate
-        r = requests.post(url + 'gwc/rest/masstruncate',
-                          headers=headers,
-                          data=payload,
-                          auth=HTTPBasicAuth(user, passwd))
-        if (r.status_code < 200 or r.status_code > 201):
-            logger.debug("Could not Truncate GWC Cache for Layer '%s'." % layer_alternate)
-    except Exception:
-        tb = traceback.format_exc()
-        logger.debug(tb)
+    if layer_alternate:
+        try:
+            if cat is None or (cat and cat.get_layer(layer_alternate)):
+                url = settings.OGC_SERVER['default']['LOCATION']
+                user = settings.OGC_SERVER['default']['USER']
+                passwd = settings.OGC_SERVER['default']['PASSWORD']
+                """
+                curl -v -u admin:geoserver \
+                -H "Content-type: text/xml" \
+                -d "<truncateLayer><layerName>{layer_alternate}</layerName></truncateLayer>" \
+                http://localhost:8080/geoserver/gwc/rest/masstruncate
+                """
+                headers = {'Content-type': 'text/xml'}
+                payload = "<truncateLayer><layerName>%s</layerName></truncateLayer>" % layer_alternate
+                r = requests.post(
+                    url + 'gwc/rest/masstruncate',
+                    headers=headers,
+                    data=payload,
+                    auth=HTTPBasicAuth(user, passwd))
+                if (r.status_code < 200 or r.status_code > 201):
+                    logger.debug("Could not Truncate GWC Cache for Layer '%s'." % layer_alternate)
+        except Exception:
+            tb = traceback.format_exc()
+            logger.debug(tb)
 
 
 @on_ogc_backend(geoserver.BACKEND_PACKAGE)