From 89a7bf195dd41422e8e2cb0b25b16ed5c2a2fc94 Mon Sep 17 00:00:00 2001
From: Mattia <mattia.giupponi@gmail.com>
Date: Mon, 29 Jul 2024 16:03:33 +0200
Subject: [PATCH] [Fixes #261] fix tests

---
 Dockerfile                             |  2 +-
 importer/tests/end2end/test_end2end.py | 22 ++++++++++------------
 importer/tests/utils.py                |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 53dcbd24..8e9398ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM geonode/geonode-base:latest-ubuntu-22.04
 RUN rm -rf /usr/src/geonode
 RUN git clone https://github.com/GeoNode/geonode.git /usr/src/geonode
-RUN cd /usr/src/geonode && git fetch --all && git checkout remote_resource_handler && cd -
+RUN cd /usr/src/geonode && git fetch --all && git checkout remote_importer && cd -
 RUN mkdir -p /usr/src/importer
 
 RUN cd ..
diff --git a/importer/tests/end2end/test_end2end.py b/importer/tests/end2end/test_end2end.py
index 355856c5..db8225b9 100644
--- a/importer/tests/end2end/test_end2end.py
+++ b/importer/tests/end2end/test_end2end.py
@@ -1,7 +1,6 @@
 import ast
 import os
 import time
-from uuid import uuid4
 
 import mock
 from django.conf import settings
@@ -9,22 +8,18 @@
 from django.test import override_settings
 from django.urls import reverse
 from dynamic_models.models import FieldSchema, ModelSchema
-import requests
 from geonode.layers.models import Dataset
 from geonode.resource.models import ExecutionRequest
 from geonode.utils import OGC_Servers_Handler
 from geoserver.catalog import Catalog
 from importer import project_dir
-from importer.publisher import DataPublisher
 from importer.tests.utils import ImporterBaseTestSupport
 import gisdata
 from geonode.base.populate_test_data import create_single_dataset
 from django.db.models import Q
 from geonode.base.models import ResourceBase
-from geonode.resource.manager import resource_manager
 import logging
 from geonode.harvesting.harvesters.wms import WebMapService
-from geonode.services.serviceprocessors.wms import WmsServiceHandler
 
 logger = logging.getLogger()
 geourl = settings.GEODATABASE_URL
@@ -134,6 +129,7 @@ def _assertimport(
 
             if assert_payload:
                 target = resource.first()
+                target.refresh_from_db()
                 for key, value in assert_payload.items():
                     if hasattr(target, key):
                         self.assertEqual(getattr(target, key), value)
@@ -465,9 +461,10 @@ def test_import_raster_overwrite(self):
 
 
 class Importer3dTilesImportTest(BaseImporterEndToEndTest):
-    @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "test_geonode_data"})
+    @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "test_geonode_data", "ASYNC_SIGNALS": "False"})
     @override_settings(
-        GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/test_geonode_data"
+        GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/test_geonode_data",
+        ASYNC_SIGNALS=False
     )
     def test_import_3dtiles(self):
         payload = {
@@ -485,12 +482,12 @@ def test_import_3dtiles(self):
             payload, initial_name, skip_geoserver=True, assert_payload=assert_payload
         )
 
-    @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "test_geonode_data"})
+    @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "test_geonode_data", "ASYNC_SIGNALS": "False"})
     @override_settings(
-        GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/test_geonode_data"
+        GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/test_geonode_data",
+        ASYNC_SIGNALS=False
     )
     def test_import_3dtiles_overwrite(self):
-
         payload = {
             "url": "https://raw.githubusercontent.com/CesiumGS/3d-tiles-samples/main/1.1/TilesetWithFullMetadata/tileset.json",
             "title": "Remote Title",
@@ -528,9 +525,10 @@ def test_import_3dtiles_overwrite(self):
 
 
 class ImporterWMSImportTest(BaseImporterEndToEndTest):
-    @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "geonode_data"})
+    @mock.patch.dict(os.environ, {"GEONODE_GEODATABASE": "test_geonode_data", "ASYNC_SIGNALS": "False"})
     @override_settings(
-        GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/geonode_data"
+        GEODATABASE_URL=f"{geourl.split('/geonode_data')[0]}/test_geonode_data",
+        ASYNC_SIGNALS=False
     )
     def test_import_wms(self):
         _, wms = WebMapService(
diff --git a/importer/tests/utils.py b/importer/tests/utils.py
index 1af863e6..4137618d 100644
--- a/importer/tests/utils.py
+++ b/importer/tests/utils.py
@@ -1,5 +1,5 @@
 from django.core.management import call_command
-from django.test import TestCase, TransactionTestCase
+from django.test import TestCase, TransactionTestCase, override_settings
 
 
 class ImporterBaseTestSupport(TestCase):