From 3eb585df2720c38f82cfbf50d1290c5958366063 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 6 Apr 2020 21:01:24 +1000
Subject: [PATCH] fixes for unit testing

---
 InvenTree/InvenTree/version.py                |  2 +-
 InvenTree/common/apps.py                      | 22 +++++++++++--------
 .../migrations/0034_auto_20200404_1238.py     |  7 +++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py
index 182c8f58f7..ae812a2695 100644
--- a/InvenTree/InvenTree/version.py
+++ b/InvenTree/InvenTree/version.py
@@ -5,9 +5,9 @@ Provides information on the current InvenTree version
 import subprocess
 from common.models import InvenTreeSetting
 
-
 INVENTREE_SW_VERSION = "0.0.10"
 
+
 def inventreeInstanceName():
     """ Returns the InstanceName settings for the current database """
     return InvenTreeSetting.get_setting("InstanceName", "")
diff --git a/InvenTree/common/apps.py b/InvenTree/common/apps.py
index 4b16fc5236..4661c69370 100644
--- a/InvenTree/common/apps.py
+++ b/InvenTree/common/apps.py
@@ -61,16 +61,20 @@ class CommonConfig(AppConfig):
         # See note above
         from .models import InvenTreeSetting
 
-        if not InvenTreeSetting.objects.filter(key='InstanceName').exists():
+        try:
+            if not InvenTreeSetting.objects.filter(key='InstanceName').exists():
 
-            val = uuid.uuid4().hex
+                val = uuid.uuid4().hex
 
-            print("No 'InstanceName' found - generating random name '{n}'".format(n=val))
+                print("No 'InstanceName' found - generating random name '{n}'".format(n=val))
 
-            name = InvenTreeSetting(
-                key="InstanceName",
-                value=val,
-                description="Instance name for this InvenTree database installation."
-            )
+                name = InvenTreeSetting(
+                    key="InstanceName",
+                    value=val,
+                    description="Instance name for this InvenTree database installation."
+                )
 
-            name.save()
+                name.save()
+        except (OperationalError, ProgrammingError):
+            # Migrations have not yet been applied - table does not exist
+            pass
diff --git a/InvenTree/part/migrations/0034_auto_20200404_1238.py b/InvenTree/part/migrations/0034_auto_20200404_1238.py
index e292202b68..aba533ff40 100644
--- a/InvenTree/part/migrations/0034_auto_20200404_1238.py
+++ b/InvenTree/part/migrations/0034_auto_20200404_1238.py
@@ -1,7 +1,7 @@
 # Generated by Django 2.2.10 on 2020-04-04 12:38
 
 from django.db import migrations
-from django.db.utils import OperationalError
+from django.db.utils import OperationalError, ProgrammingError
 
 from part.models import Part
 from stdimage.utils import render_variations
@@ -17,8 +17,9 @@ def create_thumbnails(apps, schema_editor):
             # Render thumbnail for each existing Part 
             if part.image:
                 part.image.render_variations()
-    except OperationalError:
-        print("Error - could not generate Part thumbnails")
+    except (OperationalError, ProgrammingError):
+        # Migrations have not yet been applied - table does not exist
+        print("Could not generate Part thumbnails")
 
 class Migration(migrations.Migration):