diff options
| -rw-r--r-- | archaeological_operations/tests.py | 4 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 303ed2237..a5b83ff1c 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -595,9 +595,7 @@ class OperationInitTest(object): username, password, self.user = create_user() def get_default_user(self): - if not hasattr(self, 'user') or not self.user: - self.create_user() - return self.user + return self.create_user() def create_orgas(self, user=None): if not user: diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index d3ac4a4bd..e3958814c 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -72,6 +72,9 @@ class OOOGenerationTest(TestCase): def create_superuser(): username = 'username4277' password = 'dcbqj756456!@%' + q = User.objects.filter(username=username) + if q.count(): + return username, password, q.all()[0] user = User.objects.create_superuser(username, "nomail@nomail.com", password) user.set_password(password) @@ -82,6 +85,9 @@ def create_superuser(): def create_user(): username = 'username678' password = 'dcbqj756456!@%' + q = User.objects.filter(username=username) + if q.count(): + return username, password, q.all()[0] user = User.objects.create_user(username, email="nomail2@nomail.com") user.set_password(password) user.save() |