fixed watch_test, event is a dict, not an object

Author: yliaog

kubernetes/base/watch/watch_test.py

@@ -45,17 +45,17 @@ def test_watch_with_decode(self):
 
         fake_api = Mock()
         fake_api.get_namespaces = Mock(return_value=fake_resp)
-        fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
+        fake_api.get_namespaces.__doc__ = ':rtype: V1NamespaceList'
 
         w = Watch()
         count = 1
         for e in w.stream(fake_api.get_namespaces):
             self.assertEqual("ADDED", e['type'])
             # make sure decoder worked and we got a model with the right name
-            self.assertEqual("test%d" % count, e['object'].metadata.name)
+            self.assertEqual("test%d" % count, e['object']['metadata']['name'])
             # make sure decoder worked and updated Watch.resource_version
             self.assertEqual(
-                "%d" % count, e['object'].metadata.resource_version)
+                "%d" % count, e['object']['metadata']['resourceVersion'])
             self.assertEqual("%d" % count, w.resource_version)
             count += 1
             # make sure we can stop the watch and the last event with won't be
@@ -92,7 +92,7 @@ def test_watch_with_interspersed_newlines(self):
 
         fake_api = Mock()
         fake_api.get_namespaces = Mock(return_value=fake_resp)
-        fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
+        fake_api.get_namespaces.__doc__ = ':rtype: V1NamespaceList'
 
         w = Watch()
         count = 0
@@ -105,7 +105,7 @@ def test_watch_with_interspersed_newlines(self):
             if e is None:
                 continue
             count += 1
-            self.assertEqual("test%d" % count, e['object'].metadata.name)
+            self.assertEqual("test%d" % count, e['object']['metadata']['name'])
         self.assertEqual(3, count)
 
     def test_watch_with_multibyte_utf8(self):
@@ -129,7 +129,7 @@ def test_watch_with_multibyte_utf8(self):
 
         fake_api = Mock()
         fake_api.get_configmaps = Mock(return_value=fake_resp)
-        fake_api.get_configmaps.__doc__ = ':return: V1ConfigMapList'
+        fake_api.get_configmaps.__doc__ = ':rtype: V1ConfigMapList'
 
         w = Watch()
         count = 0
@@ -140,10 +140,10 @@ def test_watch_with_multibyte_utf8(self):
         for event in w.stream(fake_api.get_configmaps, timeout_seconds=1):
             count += 1
             self.assertEqual("MODIFIED", event['type'])
-            self.assertEqual("test%d" % count, event['object'].metadata.name)
-            self.assertEqual("© %d" % count, event['object'].data["utf-8"])
+            self.assertEqual("test%d" % count, event['object']['metadata']['name'])
+            self.assertEqual("© %d" % count, event['object']['data']["utf-8"])
             self.assertEqual(
-                "%d" % count, event['object'].metadata.resource_version)
+                "%d" % count, event['object']['metadata']['resourceVersion'])
             self.assertEqual("%d" % count, w.resource_version)
         self.assertEqual(3, count)
 
@@ -175,7 +175,7 @@ def test_watch_with_invalid_utf8(self):
 
         fake_api = Mock()
         fake_api.get_configmaps = Mock(return_value=fake_resp)
-        fake_api.get_configmaps.__doc__ = ':return: V1ConfigMapList'
+        fake_api.get_configmaps.__doc__ = ':rtype: V1ConfigMapList'
 
         w = Watch()
         count = 0
@@ -186,11 +186,11 @@ def test_watch_with_invalid_utf8(self):
         for event in w.stream(fake_api.get_configmaps, timeout_seconds=1):
             count += 1
             self.assertEqual("MODIFIED", event['type'])
-            self.assertEqual("test%d" % count, event['object'].metadata.name)
-            self.assertEqual("😄 %d" % count, event['object'].data["utf-8"])
+            self.assertEqual("test%d" % count, event['object']['metadata']['name'])
+            self.assertEqual("😄 %d" % count, event['object']['data']["utf-8"])
             # expect N replacement characters in test N
             self.assertEqual("� %d".replace('�', '�'*count) %
-                             count, event['object'].data["invalid"])
+                             count, event['object']['data']["invalid"])
         self.assertEqual(3, count)
 
     def test_watch_for_follow(self):
@@ -204,7 +204,7 @@ def test_watch_for_follow(self):
 
         fake_api = Mock()
         fake_api.read_namespaced_pod_log = Mock(return_value=fake_resp)
-        fake_api.read_namespaced_pod_log.__doc__ = ':param bool follow:\n:return: str'
+        fake_api.read_namespaced_pod_log.__doc__ = ':param bool follow:\n:rtype: str'
 
         w = Watch()
         count = 1
@@ -256,7 +256,7 @@ def get_values(*args, **kwargs):
 
         fake_api = Mock()
         fake_api.get_namespaces = Mock(return_value=fake_resp)
-        fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
+        fake_api.get_namespaces.__doc__ = ':rtype: V1NamespaceList'
 
         w = Watch()
         # ensure we keep our requested resource version or the version latest
@@ -303,7 +303,7 @@ def test_watch_stream_twice(self):
 
             fake_api = Mock()
             fake_api.get_namespaces = Mock(return_value=fake_resp)
-            fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
+            fake_api.get_namespaces.__doc__ = ':rtype: V1NamespaceList'
 
             count = 1
             for e in w.stream(fake_api.get_namespaces):
@@ -330,7 +330,7 @@ def test_watch_stream_loop(self):
 
         fake_api = Mock()
         fake_api.get_namespaces = Mock(return_value=fake_resp)
-        fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
+        fake_api.get_namespaces.__doc__ = ':rtype: V1NamespaceList'
 
         count = 0
 
@@ -597,7 +597,7 @@ def test_pod_log_empty_lines(self):
 #    
 #        fake_api = Mock()
 #        fake_api.get_namespaces = Mock(return_value=fake_resp)
-#        fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
+#        fake_api.get_namespaces.__doc__ = ':rtype: V1NamespaceList'
 #    
 #        # test case with deserialize=True
 #        w = Watch()