changeset 5985:05c67c3ef222

tests: fix test_inactive_user_group_does_not_affect_user_group_permissions when running tests on mysql
author domruf <dominikruf@gmail.com>
date Fri, 17 Jun 2016 20:23:09 +0200
parents 77bd10c410ed
children b99e00fb6dd4
files kallithea/tests/models/test_permissions.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/tests/models/test_permissions.py	Fri Jun 17 19:22:53 2016 +0200
+++ b/kallithea/tests/models/test_permissions.py	Fri Jun 17 20:23:09 2016 +0200
@@ -57,10 +57,10 @@
         if hasattr(self, 'g2'):
             RepoGroupModel().delete(self.g2.group_id)
 
+        if hasattr(self, 'ug2'):
+            UserGroupModel().delete(self.ug2, force=True)
         if hasattr(self, 'ug1'):
             UserGroupModel().delete(self.ug1, force=True)
-        if hasattr(self, 'ug2'):
-            UserGroupModel().delete(self.ug2, force=True)
 
         Session().commit()