From c31b30bf83c27bb4c2ac212bfff00fac4c30b833 Mon Sep 17 00:00:00 2001 From: Ben Charlton Date: Fri, 21 Aug 2020 18:53:51 +0100 Subject: [PATCH] Fix simple tests --- InvenTree/build/test_build.py | 2 +- InvenTree/part/models.py | 8 +++++--- InvenTree/stock/tests.py | 5 +---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/InvenTree/build/test_build.py b/InvenTree/build/test_build.py index 32ad33dab3..bb7931d2f1 100644 --- a/InvenTree/build/test_build.py +++ b/InvenTree/build/test_build.py @@ -220,5 +220,5 @@ class BuildTest(TestCase): # And a new stock item created for the build output self.assertEqual(StockItem.objects.get(pk=7).quantity, 1) - self.assertEqual(StockItem.objects.get(pk=7).serial, 1) + self.assertEqual(StockItem.objects.get(pk=7).serial, "1") self.assertEqual(StockItem.objects.get(pk=7).build, self.build) diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 6d42b08101..cea78543c6 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -346,10 +346,12 @@ class Part(MPTTModel): if n is None: return 1 - elif n is int: - return n + 1 else: - return None + try: + return int(n) + 1 + except ValueError: + return None + def getSerialNumberString(self, quantity): """ diff --git a/InvenTree/stock/tests.py b/InvenTree/stock/tests.py index 513368c422..03a04b73d8 100644 --- a/InvenTree/stock/tests.py +++ b/InvenTree/stock/tests.py @@ -295,10 +295,7 @@ class StockTest(TestCase): with self.assertRaises(ValidationError): item.serializeStock(-1, [], self.user) - # Try invalid serial numbers - with self.assertRaises(ValidationError): - item.serializeStock(3, [1, 2, 'k'], self.user) - + # Not enough serial numbers for all stock items. with self.assertRaises(ValidationError): item.serializeStock(3, "hello", self.user)