[Fixes GeoNode#6880] Circle CI upload tests fail irregulary (GeoNode#6881)

* [Fixes GeoNode#6880] Circle CI upload tests fail irregulary

* CircleCI test fix: sometimes expires due to upload timeout in the test environment

* - Avoid infinite loop on upload testing

* Revert "CircleCI test fix: sometimes expires due to upload timeout in the test environment"

This reverts commit 66139fd.

Co-authored-by: Alessio Fabiani <alessio.fabiani@geo-solutions.it>
Co-authored-by: afabiani <alessio.fabiani@gmail.com>

Author: 3 people

.circleci/config.yml

@@ -107,6 +107,7 @@ jobs:
                   docker-compose -f docker-compose-test.yml exec db psql -U postgres -d test_geonode_data -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
                   docker-compose -f docker-compose-test.yml exec django bash -c '<<parameters.test_suite>>'
                 working_directory: ./
+                no_output_timeout: 20m
             - run:
                 name: Run pep8 checks
                 command: |

geonode/upload/tests/integration.py

@@ -136,6 +136,7 @@ def tearDownClass(cls):
 
     def setUp(self):
         # await startup
+        self.wait_for_progress_cnt = 0
         cl = Client(
             GEONODE_URL, GEONODE_USER, GEONODE_PASSWD
         )
@@ -169,6 +170,7 @@ def _post_teardown(self):
         pass
 
     def tearDown(self):
+        self.wait_for_progress_cnt = 0
         connections.databases['default']['ATOMIC_REQUESTS'] = False
 
         for temp_file in self._tempfiles:
@@ -423,9 +425,12 @@ def wait_for_progress(self, progress_url):
             resp = self.client.get(progress_url)
             json_data = resp.json()
             # "COMPLETE" state means done
-            if json_data.get('state', '') == 'RUNNING':
-                time.sleep(0.1)
+            if json_data.get('state', '') == 'RUNNING' and self.wait_for_progress_cnt < 300:
+                time.sleep(1.0)
+                self.wait_for_progress_cnt += 1
                 self.wait_for_progress(progress_url)
+            else:
+                self.wait_for_progress_cnt = 0
 
     def temp_file(self, ext):
         fd, abspath = tempfile.mkstemp(ext)