tests refactored

opcua/common/node.py

@@ -313,6 +313,7 @@ class Node:
         """
         return properties of node.
         properties are child nodes with a reference of type HasProperty and a NodeClass of Variable
+        COROUTINE
         """
         return self.get_children(refs=ua.ObjectIds.HasProperty, nodeclassmask=ua.NodeClass.Variable)
 

opcua/server/internal_server.py

@@ -345,7 +345,7 @@ class InternalSession(object):
         self.subscriptions.append(result.SubscriptionId)
         return result
 
-    def create_monitored_items(self, params):
+    async def create_monitored_items(self, params):
         """Returns Future"""
         subscription_result = self.subscription_service.create_monitored_items(params)
         self.iserver.server_callback_dispatcher.dispatch(

opcua/server/server.py

@@ -455,17 +455,17 @@ class Server:
         await ev_gen.set_source(source)
         return ev_gen
 
-    def create_custom_data_type(self, idx, name, basetype=ua.ObjectIds.BaseDataType, properties=None):
+    async def create_custom_data_type(self, idx, name, basetype=ua.ObjectIds.BaseDataType, properties=None):
         if properties is None:
             properties = []
-        return self._create_custom_type(idx, name, basetype, properties, [], [])
+        return await self._create_custom_type(idx, name, basetype, properties, [], [])
 
-    def create_custom_event_type(self, idx, name, basetype=ua.ObjectIds.BaseEventType, properties=None):
+    async def create_custom_event_type(self, idx, name, basetype=ua.ObjectIds.BaseEventType, properties=None):
         if properties is None:
             properties = []
-        return self._create_custom_type(idx, name, basetype, properties, [], [])
+        return await self._create_custom_type(idx, name, basetype, properties, [], [])
 
-    def create_custom_object_type(self, idx, name, basetype=ua.ObjectIds.BaseObjectType, properties=None,
+    async def create_custom_object_type(self, idx, name, basetype=ua.ObjectIds.BaseObjectType, properties=None,
                                   variables=None, methods=None):
         if properties is None:
             properties = []
@@ -473,12 +473,12 @@ class Server:
             variables = []
         if methods is None:
             methods = []
-        return self._create_custom_type(idx, name, basetype, properties, variables, methods)
+        return await self._create_custom_type(idx, name, basetype, properties, variables, methods)
 
     # def create_custom_reference_type(self, idx, name, basetype=ua.ObjectIds.BaseReferenceType, properties=[]):
     # return self._create_custom_type(idx, name, basetype, properties)
 
-    def create_custom_variable_type(self, idx, name, basetype=ua.ObjectIds.BaseVariableType, properties=None,
+    async def create_custom_variable_type(self, idx, name, basetype=ua.ObjectIds.BaseVariableType, properties=None,
                                     variables=None, methods=None):
         if properties is None:
             properties = []
@@ -486,7 +486,7 @@ class Server:
             variables = []
         if methods is None:
             methods = []
-        return self._create_custom_type(idx, name, basetype, properties, variables, methods)
+        return await self._create_custom_type(idx, name, basetype, properties, variables, methods)
 
     async def _create_custom_type(self, idx, name, basetype, properties, variables, methods):
         if isinstance(basetype, Node):

tests/test_client.py

@@ -62,8 +62,8 @@ async def test_objects_anonymous(server, client):
         await objects.add_folder(3, 'MyFolder')
 
 
-async def test_folder_anonymous(server, client):
-    objects = client.get_objects_node()
+async def test_folder_anonymous(server, admin_client, client):
+    objects = admin_client.get_objects_node()
     f = await objects.add_folder(3, 'MyFolderRO')
     f_ro = client.get_node(f.nodeid)
     assert f == f_ro