Adjusted py3 error tests to account for unicode strings

dls-controls · Apr 27, 2018 · 24063b3 · 24063b3
1 parent 8e4604c
commit 24063b3
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/tests/test_modules/test_web/test_system_websocket.py b/tests/test_modules/test_web/test_system_websocket.py
@@ -128,22 +128,22 @@ def test_error_server_and_simple_client_no_type(self):
                                        )
         resp = self.result.get(timeout=2)
 
-        #if version_info[0] == 2:
-        assert resp == dict(
-            typeid="malcolm:core/Error:1.0",
-            id=0,
-            message="FieldError: typeid field not present in dictionary " +
-                    "( d.keys() = [u'path', u'id', u'parameters'] )"
-        )
-        #elif version_info[0] == 3:
-        #    assert resp == dict(
-        #        typeid="malcolm:core/Error:1.0",
-        #        id=0,
-        #        message="FieldError: typeid field not present in dictionary " +
-        #                "( d.keys() = odict_keys(['parameters', 'path', 'id']) )"
-        #    )
-        #else:
-        #    raise Exception("Got bad python version info")
+        if version_info[0] == 2:
+            assert resp == dict(
+                typeid="malcolm:core/Error:1.0",
+                id=0,
+                message="FieldError: typeid field not present in dictionary " +
+                       "( d.keys() = [u'path', u'id', u'parameters'] )"
+            )
+        elif version_info[0] == 3:
+            assert resp == dict(
+                typeid="malcolm:core/Error:1.0",
+                id=0,
+                message="FieldError: typeid field not present in dictionary " +
+                        "( d.keys() = ['path', 'id', 'parameters'] )"
+            )
+        else:
+            raise Exception("Got bad python version info")
 
     def test_error_server_and_simple_client_bad_path_controller(self):
         self.server._loop.add_callback(self.send_message,