fix tests

tests/core/test_dockerutil.py

@@ -139,31 +139,31 @@ def test_extract_container_tags(self):
             self.assertEqual(test[2], DockerUtil().extract_container_tags(test[0], test[1]))
 
 
-    def test_docker_host_tags_ok(self):
+    def test_docker_host_metadata_ok(self):
         mock_version = mock.MagicMock(name='version', return_value={'Version': '1.13.1'})
         du = DockerUtil()
         du._client = mock.MagicMock()
         du._client.version = mock_version
         du.swarm_node_state = 'inactive'
-        self.assertEqual(['docker_version:1.13.1'], du.get_host_tags())
+        self.assertEqual({'docker_version': '1.13.1', 'docker_swarm': 'inactive'}, du.get_host_metadata())
         mock_version.assert_called_once()
 
-    def test_docker_host_tags_invalid_response(self):
+    def test_docker_host_metadata_invalid_response(self):
         mock_version = mock.MagicMock(name='version', return_value=None)
         du = DockerUtil()
         du._client = mock.MagicMock()
         du._client.version = mock_version
         du.swarm_node_state = 'inactive'
-        self.assertEqual([], DockerUtil().get_host_tags())
+        self.assertEqual({'docker_swarm': 'inactive'}, DockerUtil().get_host_metadata())
         mock_version.assert_called_once()
 
-    def test_docker_host_tags_swarm_ok(self):
+    def test_docker_host_metadata_swarm_ok(self):
         du = DockerUtil()
         mock_version = mock.MagicMock(name='version', return_value={'Version': '1.13.1'})
         mock_isswarm = mock.MagicMock(name='is_swarm', return_value=True)
         du._client = mock.MagicMock()
         du._client.version = mock_version
         du.is_swarm = mock_isswarm
 
-        self.assertEqual(['docker_version:1.13.1', 'docker_swarm:active'], DockerUtil().get_host_tags())
+        self.assertEqual({'docker_version': '1.13.1', 'docker_swarm': 'active'}, DockerUtil().get_host_metadata())
         mock_version.assert_called_once()

tests/core/test_ecsutil.py

@@ -55,7 +55,7 @@ def test_detect_agent(self, mock_init, mock_inspect, mock_gw, mock_get):
     @mock.patch('requests.get')
     @mock.patch('utils.dockerutil.DockerUtil.inspect_container')
     @mock.patch('docker.Client.__init__')
-    def test_host_tags(self, mock_init, mock_inspect, mock_get):
+    def test_host_metadata(self, mock_init, mock_inspect, mock_get):
         mock_inspect.return_value = {}
         mock_get.return_value = MockResponse({"Cluster": "default-xvello",
                                               "Version": "Amazon ECS Agent - v1.14.1 (467c3d7)"}, 200)
@@ -65,6 +65,6 @@ def test_host_tags(self, mock_init, mock_inspect, mock_get):
         util.agent_url = 'http://dummy'
 
         mock_get.reset_mock()
-        tags = util.get_host_tags()
-        self.assertEqual(['ecs_version:1.14.1'], tags)
+        meta = util.get_host_metadata()
+        self.assertEqual({'ecs_version': '1.14.1'}, meta)
         mock_get.assert_called_once_with('http://dummy/v1/metadata', timeout=1)

tests/core/test_mesosutil.py

@@ -79,7 +79,7 @@ def test_agents_detection(self, mock_init, mock_get):
     @mock.patch.dict(os.environ, {"LIBPROCESS_IP": "a"})
     @mock.patch('requests.get')
     @mock.patch('docker.Client.__init__')
-    def test_host_tags(self, mock_init, mock_get):
+    def test_host_metadata(self, mock_init, mock_get):
         mock_get.side_effect = [
             MockResponse({'version': '1.2.1'}, 200),
             MockResponse({'dcos_version': '1.9.0'}, 200),
@@ -93,6 +93,6 @@ def test_host_tags(self, mock_init, mock_get):
 
         util = MesosUtil()
         util.__init__()
-        tags = util.get_host_tags()
+        metadata = util.get_host_metadata()
 
-        self.assertEqual(['mesos_version:1.2.1', 'dcos_version:1.9.0'], tags)
+        self.assertEqual({'mesos_version': '1.2.1', 'dcos_version': '1.9.0'}, metadata)

tests/core/test_nomadutil.py

@@ -39,13 +39,13 @@ def test_no_detect(self):
 
     @mock.patch('requests.get')
     @mock.patch('docker.Client.__init__')
-    def test_host_tags(self, mock_init, mock_get):
+    def test_host_metadata(self, mock_init, mock_get):
         mock_get.return_value = MockResponse({"config": {"Datacenter": "dc1", "Region": "global",
                                                          "Version": "0.5.4"}}, 200)
         mock_init.return_value = None
 
         util = NomadUtil()
         util.__init__()
-        tags = util.get_host_tags()
+        metadata = util.get_host_metadata()
 
-        self.assertEqual(['nomad_version:0.5.4', 'nomad_region:global', 'nomad_datacenter:dc1'], tags)
+        self.assertEqual({'nomad_version': '0.5.4', 'nomad_region': 'global', 'nomad_datacenter': 'dc1'}, metadata)