[LIB-837] correct docs examples, polish the tests;

Syncano · opalczynski · Aug 24, 2016 · Aug 10, 2016 · Aug 11, 2016 · Aug 11, 2016
commit 9f5adba3afaa90a3eae2e0e9a038098a8fe48530
diff --git a/docs/source/custom_sockets.rst b/docs/source/custom_sockets.rst
@@ -53,26 +53,26 @@ To create a custom socket follow these steps::
     # 4.1 Using a new script - define a new source code.
     custom_socket.add_dependency(
         ScriptDependency(
-            name='custom_script'
-            script=Script(
+            Script(
                 runtime_name=RuntimeChoices.PYTHON_V5_0,
                 source='print("custom_script")'
-            )
+            ),
+            name='custom_script'
         )
     )
     # 4.2 Using an existing script.
     another_custom_script = Script.please.get(id=2)
     custom_socket.add_dependency(
         ScriptDependency(
+            another_custom_script,
             name='another_custom_script',
-            script=another_custom_script
         )
     )
 
     # 4.3 Using an existing ScriptEndpoint.
     script_endpoint = ScriptEndpoint.please.get(name='script_endpoint_name')
     custom_socket.add_dependency(
-        script_endpoint=script_endpoint
+        script_endpoint
     )
 
     # 5. Publish custom_socket.
@@ -186,11 +186,11 @@ Currently the only supported dependency is a Script.
 
     custom_socket.add_dependency(
         ScriptDependency(
-            name='custom_script'
-            script=Script(
+            Script(
                 runtime_name=RuntimeChoices.PYTHON_V5_0,
                 source='print("custom_script")'
-            )
+            ),
+            name='custom_script'
         )
     )
 
@@ -202,8 +202,8 @@ Currently the only supported dependency is a Script.
     another_custom_script = Script.please.get(id=2)
     custom_socket.add_dependency(
         ScriptDependency(
-            name='another_custom_script',
-            script=another_custom_script
+            another_custom_script,
+            name='another_custom_script'
         )
     )
 
@@ -213,7 +213,15 @@ Currently the only supported dependency is a Script.
 
     script_endpoint = ScriptEndpoint.please.get(name='script_endpoint_name')
     custom_socket.add_dependency(
-        script_endpoint=script_endpoint
+        script_endpoint
+    )
+
+You can overwrite the name in the following way::
+
+    script_endpoint = ScriptEndpoint.please.get(name='script_endpoint_name')
+    custom_socket.add_dependency(
+        script_endpoint,
+        name='custom_name'
     )
 
 Custom socket recheck

diff --git a/syncano/models/custom_sockets.py b/syncano/models/custom_sockets.py
@@ -26,6 +26,8 @@ class CustomSocket(EndpointMetadataMixin, DependencyMetadataMixin, Model):
     metadata = fields.JSONField(read_only=True, required=False)
     status = fields.StringField(read_only=True, required=False)
     status_info = fields.StringField(read_only=True, required=False)
+    created_at = fields.DateTimeField(read_only=True, required=False)
+    updated_at = fields.DateTimeField(read_only=True, required=False)
     links = fields.LinksField()
 
     class Meta:
@@ -52,7 +54,7 @@ def get_endpoints(self):
 
     def run(self, endpoint_name, method='GET', data=None):
         endpoint = self._find_endpoint(endpoint_name)
-        return endpoint.run(method, data=data or {})
+        return endpoint.run(method=method, data=data or {})
 
     def _find_endpoint(self, endpoint_name):
         endpoints = self.get_endpoints()

diff --git a/tests/integration_test_custom_socket.py b/tests/integration_test_custom_socket.py
@@ -20,6 +20,7 @@ class CustomSocketTest(InstanceMixin, IntegrationTest):
     def setUpClass(cls):
         super(CustomSocketTest, cls).setUpClass()
         cls.custom_socket = cls._create_custom_socket('default', cls._define_dependencies_new_script_endpoint)
+        cls._assert_custom_socket(cls.custom_socket)
 
     def test_publish_custom_socket(self):
         # this test new ScriptEndpoint dependency create;
@@ -70,7 +71,7 @@ def test_fetching_all_endpoints(self):
         self.assertTrue(all_endpoints[0].name)
 
     def test_endpoint_run(self):
-        script_endpoint = SocketEndpoint.please.first()
+        script_endpoint = SocketEndpoint.get_all_endpoints()[0]
         result = script_endpoint.run()
         suffix = script_endpoint.name.split('_')[-1]
         self.assertTrue(result.result['stdout'].endswith(suffix))
@@ -92,7 +93,13 @@ def test_custom_socket_update(self):
 
     def assert_custom_socket(self, suffix, dependency_method):
         custom_socket = self._create_custom_socket(suffix, dependency_method=dependency_method)
-        self.assertTrue(custom_socket.name)
+        self._assert_custom_socket(custom_socket)
+
+    @classmethod
+    def _assert_custom_socket(cls, custom_socket):
+        cls.assertTrue(custom_socket.name)
+        cls.assertTrue(custom_socket.created_at)
+        cls.assertTrue(custom_socket.updated_at)
 
     @classmethod
     def _create_custom_socket(cls, suffix, dependency_method):