circle: fix tests

circle/acl/tests/models.py

@@ -15,29 +15,4 @@
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.db.models import TextField, ForeignKey
-from django.contrib.auth.models import User
-
-from ..models import AclBase
-
-
-class TestModel(AclBase):
-    normal_field = TextField()
-
-    ACL_LEVELS = (
-        ('alfa', 'Alfa'),
-        ('bravo', 'Bravo'),
-        ('charlie', 'Charlie'),
-    )
-
-
-class Test2Model(AclBase):
-    normal2_field = TextField()
-    owner = ForeignKey(User, null=True)
-
-    ACL_LEVELS = (
-        ('one', 'One'),
-        ('two', 'Two'),
-        ('three', 'Three'),
-        ('owner', 'owner'),
-    )
+from .test_acl import TestModel, Test2Model  # noqa

circle/acl/tests/test_acl.py

@@ -17,9 +17,31 @@
 
 from django.test import TestCase
 from django.contrib.auth.models import User, Group, AnonymousUser
+from django.db.models import TextField, ForeignKey
 
-from ..models import ObjectLevel
-from .models import TestModel, Test2Model
+from ..models import ObjectLevel, AclBase
+
+
+class TestModel(AclBase):
+    normal_field = TextField()
+
+    ACL_LEVELS = (
+        ('alfa', 'Alfa'),
+        ('bravo', 'Bravo'),
+        ('charlie', 'Charlie'),
+    )
+
+
+class Test2Model(AclBase):
+    normal2_field = TextField()
+    owner = ForeignKey(User, null=True)
+
+    ACL_LEVELS = (
+        ('one', 'One'),
+        ('two', 'Two'),
+        ('three', 'Three'),
+        ('owner', 'owner'),
+    )
 
 
 class AclUserTest(TestCase):

circle/dashboard/tests/test_mockedviews.py

@@ -389,6 +389,7 @@ class RenewViewTest(unittest.TestCase):
             inst = MagicMock(spec=Instance)
             inst._meta.object_name = "Instance"
             inst.name = 'foo'
+            inst.lease = MagicMock(pk=99)
             inst.renew = Instance._ops['renew'](inst)
             inst.has_level.return_value = True
             go.return_value = inst
@@ -403,6 +404,7 @@ class RenewViewTest(unittest.TestCase):
                 patch('dashboard.views.util.messages') as msg:
             inst = MagicMock(spec=Instance)
             inst._meta.object_name = "Instance"
+            inst.lease = MagicMock(pk=99)
             inst.renew = Instance._ops['renew'](inst)
             inst.renew.async = MagicMock()
             inst.has_level.return_value = True
@@ -421,6 +423,7 @@ class RenewViewTest(unittest.TestCase):
                 patch('dashboard.views.util.messages') as msg:
             inst = MagicMock(spec=Instance)
             inst._meta.object_name = "Instance"
+            inst.lease = MagicMock(pk=99)
             inst.renew = Instance._ops['renew'](inst)
             inst.renew.async = MagicMock()
             inst.has_level.return_value = True
@@ -463,6 +466,7 @@ class RenewViewTest(unittest.TestCase):
         with patch.object(view, 'get_object') as go:
             inst = MagicMock(spec=Instance, pk=11)
             inst._meta.object_name = "Instance"
+            inst.lease = MagicMock(pk=99)
             inst.renew = Instance._ops['renew'](inst)
             inst.renew.async = MagicMock()
             inst.has_level.return_value = False