Check for Sqlite ProgramingError Exception (#1106)

* fix for sqlite programming error that is triggered when harvesting apps * added test * merge Programming errors * fix run.sh if statements order * removed changes to the run.sh --------- Co-authored-by: romer8 <[email protected]>
tethysplatform · Oct 28, 2024 · da1d12a · da1d12a
1 parent d4a8761
commit da1d12a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/docker/run.sh b/docker/run.sh
@@ -135,4 +135,4 @@ if [[ $test = false ]]; then
 
   # Read output from tail; wait for kill or stop command (docker waits here)
   wait
-fi
+fi
diff --git a/tests/unit_tests/test_tethys_apps/test_harvester.py b/tests/unit_tests/test_tethys_apps/test_harvester.py
@@ -4,6 +4,7 @@
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.utils import ProgrammingError
+from sqlite3 import ProgrammingError as SqliteProgrammingError
 from tethys_apps.harvester import SingletonHarvester
 from tethys_apps.base.testing.environment import set_testing_environment
 
@@ -296,16 +297,19 @@ def test_harvest_app_instances_programming_error(
         :return:
         """
         list_apps = {"test_app": "tethysapp.test_app"}
+        exceptions = [ProgrammingError, SqliteProgrammingError]
 
-        mock_permissions.side_effect = ProgrammingError
+        for exception in exceptions:
+            with self.subTest(exception=exception):
+                mock_permissions.side_effect = exception
 
-        shv = SingletonHarvester()
-        shv._harvest_app_instances(list_apps)
+                shv = SingletonHarvester()
+                shv._harvest_app_instances(list_apps)
 
-        mock_logwarning.assert_called()
-        mock_permissions.assert_called()
-        self.assertIn("Tethys Apps Loaded:", mock_stdout.getvalue())
-        self.assertIn("test_app", mock_stdout.getvalue())
+                mock_logwarning.assert_called()
+                mock_permissions.assert_called()
+                self.assertIn("Tethys Apps Loaded:", mock_stdout.getvalue())
+                self.assertIn("test_app", mock_stdout.getvalue())
 
     @mock.patch("sys.stdout", new_callable=io.StringIO)
     @mock.patch("tethys_apps.harvester.tethys_log.warning")

diff --git a/tethys_apps/harvester.py b/tethys_apps/harvester.py
@@ -11,7 +11,7 @@
 import inspect
 import logging
 import pkgutil
-
+from sqlite3 import ProgrammingError as SqliteProgrammingError
 from django.db.utils import ProgrammingError
 from django.core.exceptions import ObjectDoesNotExist
 from tethys_apps.base import TethysAppBase, TethysExtensionBase
@@ -323,6 +323,11 @@ def _harvest_app_instances(self, app_packages_list):
                                     "Unable to register app permissions. django_content_type "
                                     "table does not exist"
                                 )
+                            except SqliteProgrammingError:
+                                tethys_log.warning(
+                                    "Unable to register app permissions. django_content_type "
+                                    "table does not exist in sqlite3"
+                                )
                             except ObjectDoesNotExist as e:
                                 tethys_log.warning(e)