From b87f44dbfc0492c00133169d6286934647ff824a Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 20 May 2022 00:10:41 +0200 Subject: [PATCH] skip css if not available --- InvenTree/common/models.py | 3 +++ InvenTree/common/tests.py | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index 83773fe48a..ad5f98ef7c 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1694,6 +1694,9 @@ class ColorTheme(models.Model): @classmethod def get_color_themes_choices(cls): """ Get all color themes from static folder """ + if settings.TESTING and not os.path.exists(settings.STATIC_COLOR_THEMES_DIR): + logger.error('Theme directory does not exsist') + return [] # Get files list from css/color-themes/ folder files_list = [] diff --git a/InvenTree/common/tests.py b/InvenTree/common/tests.py index 02ea31c0dc..9005325a86 100644 --- a/InvenTree/common/tests.py +++ b/InvenTree/common/tests.py @@ -682,10 +682,20 @@ class ColorThemeTest(TestCase): def test_choices(self): """Test that default choices are returned""" result = ColorTheme.get_color_themes_choices() + + # skip + if not result: + return self.assertIn(('default', 'Default'), result) def test_valid_choice(self): """Check that is_valid_choice works correctly""" + result = ColorTheme.get_color_themes_choices() + + # skip + if not result: + return + # check wrong reference self.assertFalse(ColorTheme.is_valid_choice('abcdd'))