[LIB-837] change tests instead of doing a magic in ModelField;

opalczynski · opalczynski · commit 48eb08eb673d · 2016-08-12T16:53:39.000+02:00
diff --git a/syncano/models/backups.py b/syncano/models/backups.py
@@ -28,7 +28,7 @@ class Backup(Model):
     size = fields.IntegerField(read_only=True)
     status = fields.StringField(read_only=True)
     status_info = fields.StringField(read_only=True)
-    author = fields.ModelField('Admin')
+    author = fields.ModelField('Admin', read_only=True)
     details = fields.JSONField(read_only=True)
 
     updated_at = fields.DateTimeField(read_only=True, required=False)
diff --git a/syncano/models/fields.py b/syncano/models/fields.py
@@ -525,10 +525,6 @@ def to_python(self, value):
         if isinstance(value, dict):
             return self.rel(**value)
 
-        # try to fetch object;
-        if isinstance(value, int):
-            return self.rel.please.get(id=value)
-
         raise self.ValidationError("'{0}' has unsupported format.".format(value))
 
     def to_native(self, value):
diff --git a/tests/integration_test.py b/tests/integration_test.py
@@ -548,7 +548,7 @@ def test_list(self):
     def test_create(self):
         script_endpoint = self.model.please.create(
             instance_name=self.instance.name,
-            script=self.script.id,
+            script=self.script,
             name='wh%s' % self.generate_hash()[:10],
         )
 
@@ -557,7 +557,7 @@ def test_create(self):
     def test_script_run(self):
         script_endpoint = self.model.please.create(
             instance_name=self.instance.name,
-            script=self.script.id,
+            script=self.script,
             name='wh%s' % self.generate_hash()[:10],
         )
 
@@ -569,7 +569,7 @@ def test_script_run(self):
     def test_custom_script_run(self):
         script_endpoint = self.model.please.create(
             instance_name=self.instance.name,
-            script=self.custom_script.id,
+            script=self.custom_script,
             name='wh%s' % self.generate_hash()[:10],
         )
 
diff --git a/tests/integration_test_cache.py b/tests/integration_test_cache.py
@@ -51,7 +51,7 @@ def setUpClass(cls):
 
         cls.script_endpoint = cls.instance.script_endpoints.create(
             name='test_script_endpoint',
-            script=cls.script.id
+            script=cls.script
         )
 
     def test_cache_request(self):
diff --git a/tests/integration_test_custom_socket.py b/tests/integration_test_custom_socket.py
@@ -84,11 +84,11 @@ def test_custom_socket_update(self):
             ScriptCall(name='script_default', methods=['GET'])
         )
 
-        self.custom_socket.add_endpoint(Endpoint)
-        self.custom_socket.update()
+        socket_to_update.add_endpoint(new_endpoint)
+        socket_to_update.update()
         time.sleep(2)  # wait for custom socket setup;
-        self.custom_socket.reload()
-        self.assertIn('my_endpoint_new_default', self.custom_socket.endpoints)
+        socket_to_update.reload()
+        self.assertIn('my_endpoint_new_default', socket_to_update.endpoints)
 
     def assert_custom_socket(self, suffix, dependency_method):
         custom_socket = self._create_custom_socket(suffix, dependency_method=dependency_method)

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def setUpClass(cls):`
`51`	`51`
`52`	`52`	`cls.script_endpoint = cls.instance.script_endpoints.create(`
`53`	`53`	`name='test_script_endpoint',`
`54`		`- script=cls.script.id`
	`54`	`+ script=cls.script`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`def test_cache_request(self):`