fix tests

Author: oroulet

.gitignore

@@ -4,4 +4,8 @@
 .idea/workspace.xml
 .idea/vcs.xml
 .idea/misc.xml
-.idea/modules.xml
+.idea/modules.xml
+*.sw*
+.mypy*
+dist*
+*.egg*

.travis.yml

@@ -2,17 +2,11 @@ language: python
 python:
   - "3.6"
 env:
-  - DISPLAY=:99.0
-before_install:
-  - sh -e /etc/init.d/xvfb start
+  - QT_QPA_PLATFORM=minimal
 install:
-  - pip install python-dateutil
-  - pip install cryptography
   - pip install pytest
   - pip install pyqt5
-  - pip install pytz
-  - pip install lxml
-  - git clone https://github.com/FreeOpcUa/python-opcua.git 
-  - git clone https://github.com/FreeOpcUa/opcua-widgets.git 
+  - pip install opcua
+  - pip install opcua-widgets
 # command to run tests
-script: pytest -v
+script: pytest -v -s

test_uamodeler.py

@@ -1,10 +1,11 @@
 
 import sys
 import pytest
+import time
 
 from opcua import ua
 
-from PyQt5.QtCore import QTimer, QSettings, QModelIndex, Qt, QCoreApplication
+from PyQt5.QtCore import QTimer, QSettings, QModelIndex, Qt, QCoreApplication, QEventLoop
 from PyQt5.QtWidgets import QApplication, QAbstractItemDelegate
 
 from uamodeler.uamodeler import UaModeler
@@ -51,7 +52,7 @@ def test_save_open_xml(modeler, mgr):
     val = 0.99
     mgr.new_model()
     modeler.tree_ui.expand_to_node("Objects")
-    node = mgr.add_variable(1, "myvar", val)
+    node = mgr.add_variable(0, "myvar", val)
     mgr.save_xml(path)
     mgr.close_model()
     with pytest.raises(Exception):
@@ -88,13 +89,12 @@ def test_delete_save(modeler, mgr, model):
     modeler.tree_ui.expand_to_node("Objects")
     obj_node = mgr.add_folder(1, "myobj")
     obj2_node = mgr.add_folder(1, "myobj2")
-    QApplication.processEvents()
+    QApplication.processEvents(QEventLoop.WaitForMoreEvents|QEventLoop.AllEvents)
     modeler.tree_ui.expand_to_node("myobj2")
     var_node = mgr.add_variable(1, "myvar", val)
     mgr.save_ua_model(path)
     mgr.save_xml(path)
-
-    QApplication.processEvents()
+    QApplication.processEvents(QEventLoop.WaitForMoreEvents|QEventLoop.AllEvents)
     modeler.tree_ui.expand_to_node(obj2_node)
     mgr.delete_node(obj2_node)
     mgr.save_ua_model(path)
@@ -165,6 +165,8 @@ def test_structs_2(modeler, mgr):
     modeler.tree_ui.expand_to_node(struct_node)
     mystruct = mgr.add_data_type(1, "MyStruct")
     QApplication.processEvents()
+    QApplication.processEvents()
+    QApplication.processEvents()
     modeler.tree_ui.expand_to_node("MyStruct")
     var_node = mgr.add_variable(1, "myvar", 0.1)
 

uamodeler/model_manager.py

@@ -211,7 +211,7 @@ def _get_path(self, path):
             path = self.current_path
         if path is None:
             raise ValueError("No path is defined")
-        self.current_path = os.path.splitext(path)[0] 
+        self.current_path = os.path.splitext(path)[0]
         self.titleChanged.emit(self.current_path)
         return self.current_path
 
@@ -347,7 +347,11 @@ def _save_structs(self):
         struct_node = self.server_mgr.get_node(ua.ObjectIds.Structure)
         dict_name = "TypeDictionary"
         idx = 1
-        urn = self.server_mgr.get_namespace_array()[1]
+        ar = self.server_mgr.get_namespace_array()
+        if len(ar) == 1:
+            #no custom namepsace defined, there should not be any structures
+            return
+        urn = self.server_mgr.get_namespace_array()[idx]
         to_delete = []
         have_structs = False
         to_add = []