[Fixes #6916] gsimporter.api.NotFound caused by missing trailing slas…

…h at the end of GEOSERVER_LOCATION (#6913) * [Fixes #6916] gsimporter.api.NotFound caused by missing trailing slash at the end of GEOSERVER_LOCATION * [Fixes #6916] unit test for GEOSERVER_LOCATION
GeoNode · Feb 3, 2021 · e7cea19 · e7cea19
1 parent 7c6b4b3
commit e7cea19
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/geonode/settings.py b/geonode/settings.py
@@ -951,6 +951,10 @@
     'GEOSERVER_LOCATION', 'http://localhost:8080/geoserver/'
 )
 
+# add trailing slash to geoserver location url.
+if not GEOSERVER_LOCATION.endswith('/'):
+    GEOSERVER_LOCATION = '{}/'.format(GEOSERVER_LOCATION)
+
 GEOSERVER_PUBLIC_SCHEMA = os.getenv(
     'GEOSERVER_PUBLIC_SCHEMA', SITE_HOST_SCHEMA
 )

diff --git a/geonode/tests/smoke.py b/geonode/tests/smoke.py
@@ -128,6 +128,12 @@ def test_opensearch_description(self):
         response = self.client.get(reverse('opensearch_dispatch'))
         self.assertEqual(response.status_code, 200)
 
+    # Settings Tests #
+
+    def test_settings_geoserver_location(self):
+        '''Ensure GEOSERVER_LOCATION variable ends with /'''
+        self.assertTrue(settings.GEOSERVER_LOCATION.endswith('/'))
+
 
 class GeoNodeUtilsTests(GeoNodeBaseTestSupport):