From 095ef51991b1f857bf52d5b3f2cff11a51164426 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 5 Oct 2020 08:29:36 +1100 Subject: [PATCH] Cleanup unit testing --- InvenTree/users/tests.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/InvenTree/users/tests.py b/InvenTree/users/tests.py index ad3a6ec5ae..d87649e2db 100644 --- a/InvenTree/users/tests.py +++ b/InvenTree/users/tests.py @@ -59,8 +59,6 @@ class RuleSetModelTest(TestCase): table_name = model.objects.model._meta.db_table available_tables.append(table_name) - errors = 0 - assigned_models = [] # Now check that each defined model is a valid table name @@ -72,10 +70,6 @@ class RuleSetModelTest(TestCase): assigned_models.append(m) - if m not in available_tables: - print("{n} is not a valid database table".format(n=m)) - errors += 1 - missing_models = [] for model in available_tables: @@ -87,5 +81,18 @@ class RuleSetModelTest(TestCase): for m in missing_models: print("-", m) - self.assertEqual(errors, 0) + extra_models = [] + + defined_models = assigned_models + RuleSet.RULESET_IGNORE + + for model in defined_models: + if model not in available_tables: + extra_models.append(model) + + if len(extra_models) > 0: + print("The following RuleSet permissions do not match a database model:") + for m in extra_models: + print("-", m) + self.assertEqual(len(missing_models), 0) + self.assertEqual(len(extra_models), 0)