From 57d260d56afbdd5862c2a4e560f66254be732744 Mon Sep 17 00:00:00 2001
From: Dudás Ádám <dudas.adam@cloud.bme.hu>
Date: Sat, 26 Apr 2014 18:17:58 +0200
Subject: [PATCH] vm: remove __new__ patches

Patching __new__ on an object seems to have lasting effects even after the
context block's end.
---
 circle/vm/tests/test_models.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/circle/vm/tests/test_models.py b/circle/vm/tests/test_models.py
index d272ea1..a1f7d08 100644
--- a/circle/vm/tests/test_models.py
+++ b/circle/vm/tests/test_models.py
@@ -1,5 +1,6 @@
 from datetime import datetime
 from mock import Mock, MagicMock, patch, call
+import types
 
 from django.contrib.auth.models import User
 from django.test import TestCase
@@ -180,14 +181,18 @@ class InstanceActivityTestCase(TestCase):
     def test_create_no_concurrency_check(self):
         instance = MagicMock(spec=Instance)
         instance.activity_log.filter.return_value.exists.return_value = True
-
-        with patch.object(InstanceActivity, '__new__'):
-            try:
-                InstanceActivity.create('test', instance,
-                                        concurrency_check=False)
-            except ActivityInProgressError:
-                raise AssertionError("'create' method checked for concurrent "
-                                     "activities.")
+        mock_instance_activity_cls = MagicMock(spec=InstanceActivity,
+                                               ACTIVITY_CODE_BASE='test')
+
+        original_create = InstanceActivity.create
+        mocked_create = types.MethodType(original_create.im_func,
+                                         mock_instance_activity_cls,
+                                         original_create.im_class)
+        try:
+            mocked_create('test', instance, concurrency_check=False)
+        except ActivityInProgressError:
+            raise AssertionError("'create' method checked for concurrent "
+                                 "activities.")
 
     def test_create_sub_concurrency_check(self):
         iaobj = MagicMock(spec=InstanceActivity)
@@ -201,10 +206,10 @@ class InstanceActivityTestCase(TestCase):
         iaobj.activity_code = 'test'
         iaobj.children.filter.return_value.exists.return_value = True
 
-        with patch.object(InstanceActivity, '__new__'):
+        create_sub_func = InstanceActivity.create_sub
+        with patch('vm.models.activity.InstanceActivity'):
             try:
-                InstanceActivity.create_sub(iaobj, 'test',
-                                            concurrency_check=False)
+                create_sub_func(iaobj, 'test', concurrency_check=False)
             except ActivityInProgressError:
                 raise AssertionError("'create_sub' method checked for "
                                      "concurrent activities.")
--
libgit2 0.26.0