Skip to content

Commit 050aa97

Browse files
[FIXIES 13034] Fixing the test test_dataset_permissions (#13035)
* [FIXIES 13034] fixing the test test_dataset_permissions * [FIXIES 13034] align geoserver to latest version --------- Co-authored-by: Mattia <[email protected]>
1 parent 126f64e commit 050aa97

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

docker-compose-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ services:
9292

9393
# Geoserver backend
9494
geoserver:
95-
image: geonode/geoserver:2.24.3-latest
95+
image: geonode/geoserver:2.24.4-latest
9696
container_name: geoserver4${COMPOSE_PROJECT_NAME}
9797
healthcheck:
9898
test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -118,7 +118,7 @@ services:
118118
condition: service_healthy
119119

120120
data-dir-conf:
121-
image: geonode/geoserver_data:2.24.3-latest
121+
image: geonode/geoserver_data:2.24.4-latest
122122
container_name: gsconf4${COMPOSE_PROJECT_NAME}
123123
entrypoint: sleep infinity
124124
volumes:

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ services:
9191

9292
# Geoserver backend
9393
geoserver:
94-
image: geonode/geoserver:2.24.3-latest
94+
image: geonode/geoserver:2.24.4-latest
9595
container_name: geoserver4${COMPOSE_PROJECT_NAME}
9696
healthcheck:
9797
test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -117,7 +117,7 @@ services:
117117
condition: service_healthy
118118

119119
data-dir-conf:
120-
image: geonode/geoserver_data:2.24.3-latest
120+
image: geonode/geoserver_data:2.24.4-latest
121121
container_name: gsconf4${COMPOSE_PROJECT_NAME}
122122
entrypoint: sleep infinity
123123
volumes:

geonode/security/tests.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,11 @@ def test_dataset_permissions(self):
755755
bobby = get_user_model().objects.get(username="bobby")
756756

757757
self.client.force_login(get_user_model().objects.get(username="admin"))
758-
payload = {"base_file": open(f"{project_dir}/tests/fixture/valid.geojson", "rb"), "action": "upload"}
758+
payload = {
759+
"base_file": open(f"{project_dir}/tests/fixture/valid.geojson", "rb"),
760+
"action": "upload",
761+
"override_existing_layer": True,
762+
}
759763
response = self.client.post(reverse("importer_upload"), data=payload)
760764
layer = ResourceHandlerInfo.objects.filter(execution_request=response.json()["execution_id"]).first().resource
761765
if layer is None:
@@ -806,6 +810,18 @@ def test_dataset_permissions(self):
806810
self.assertTrue(b"Could not find layer" in response.content)
807811
self.assertEqual(response.headers.get("Content-Type"), "application/vnd.ogc.se_xml;charset=UTF-8")
808812

813+
# In circleCI we load some sample data via paver, but is not a mandatory action
814+
# in other cases when we dont have those layer, we have to rely on the one
815+
# we upload earlier on line 763 (same test)
816+
url = (
817+
f"{settings.GEOSERVER_LOCATION}ows?"
818+
f"LAYERS={layer.alternate}&STYLES="
819+
"&FORMAT=image%2Fpng&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap"
820+
"&SRS=EPSG%3A4326"
821+
"&BBOX=-81.394599749999,13.316009005566,"
822+
"-81.370560451855,13.372728455566"
823+
"&WIDTH=217&HEIGHT=512"
824+
)
809825
# test WMS with authenticated user that has access to the Dataset
810826
response = requests.get(
811827
url,

0 commit comments

Comments
 (0)