From 4d5e267753cf123bfad8117c058dba7f6e52ca59 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 28 Jul 2022 13:52:16 +1000 Subject: [PATCH] Fit for unit test (#3426) * Fit for unit test - Write known value to setting before perfoming read test (cherry picked from commit 7042d8b9badb7bf50f6f6566c3d4171d68d43f0c) * Allow longer timeout for image download tests (cherry picked from commit e1ce13043fb9370e2b5e81342f039703aaa12444) --- InvenTree/InvenTree/tests.py | 8 ++++---- InvenTree/common/tests.py | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/InvenTree/InvenTree/tests.py b/InvenTree/InvenTree/tests.py index b6d46bea80..823c9a918b 100644 --- a/InvenTree/InvenTree/tests.py +++ b/InvenTree/InvenTree/tests.py @@ -267,7 +267,7 @@ class TestHelpers(TestCase): # Attempt to download an image which throws a 404 with self.assertRaises(requests.exceptions.HTTPError): - helpers.download_image_from_url("https://httpstat.us/404") + helpers.download_image_from_url("https://httpstat.us/404", timeout=10) # Attempt to download, but timeout with self.assertRaises(requests.exceptions.Timeout): @@ -275,7 +275,7 @@ class TestHelpers(TestCase): # Attempt to download, but not a valid image with self.assertRaises(TypeError): - helpers.download_image_from_url("https://httpstat.us/200") + helpers.download_image_from_url("https://httpstat.us/200", timeout=10) large_img = "https://github.com/inventree/InvenTree/raw/master/InvenTree/InvenTree/static/img/paper_splash_large.jpg" @@ -283,13 +283,13 @@ class TestHelpers(TestCase): # Attempt to download an image which is too large with self.assertRaises(ValueError): - helpers.download_image_from_url(large_img) + helpers.download_image_from_url(large_img, timeout=10) # Increase allowable download size InvenTreeSetting.set_setting('INVENTREE_DOWNLOAD_IMAGE_MAX_SIZE', 5, change_user=None) # Download a valid image (should not throw an error) - helpers.download_image_from_url(large_img) + helpers.download_image_from_url(large_img, timeout=10) class TestQuoteWrap(TestCase): diff --git a/InvenTree/common/tests.py b/InvenTree/common/tests.py index 70d19101ef..2313164935 100644 --- a/InvenTree/common/tests.py +++ b/InvenTree/common/tests.py @@ -534,8 +534,10 @@ class NotificationUserSettingsApiTest(InvenTreeAPITestCase): def test_setting(self): """Test the string name for NotificationUserSetting.""" + + NotificationUserSetting.set_setting('NOTIFICATION_METHOD_MAIL', True, change_user=self.user, user=self.user) test_setting = NotificationUserSetting.get_setting_object('NOTIFICATION_METHOD_MAIL', user=self.user) - self.assertEqual(str(test_setting), 'NOTIFICATION_METHOD_MAIL (for testuser): ') + self.assertEqual(str(test_setting), 'NOTIFICATION_METHOD_MAIL (for testuser): True') class PluginSettingsApiTest(InvenTreeAPITestCase):