Merge "Create Dockerfile to create a yardstick-image of docker"

[yardstick.git] / yardstick / tests / unit / benchmark / contexts / test_node.py

diff --git a/yardstick/tests/unit/benchmark/contexts/test_node.py b/yardstick/tests/unit/benchmark/contexts/test_node.py
index 5d7b24c..da16074 100644 (file)
--- a/yardstick/tests/unit/benchmark/contexts/test_node.py
+++ b/yardstick/tests/unit/benchmark/contexts/test_node.py
@@ -8,14 +8,16 @@
 ##############################################################################
 
 import os
-import unittest
 import errno
+
 import mock
+import unittest
 
-from yardstick.common import constants as consts
 from yardstick.benchmark.contexts import base
 from yardstick.benchmark.contexts import node
+from yardstick.common import constants as consts
 from yardstick.common import exceptions
+from yardstick.common import yaml_loader
 
 
 class NodeContextTestCase(unittest.TestCase):
@@ -56,7 +58,7 @@ class NodeContextTestCase(unittest.TestCase):
         self.assertEqual(self.test_context.env, {})
         self.assertEqual(self.test_context.attrs, {})
 
-    @mock.patch('yardstick.common.utils.read_yaml_file')
+    @mock.patch.object(yaml_loader, 'read_yaml_file')
     @mock.patch('{}.os.path.join'.format(PREFIX))
     def test_init_negative(self, mock_path_join, read_mock):
         special_path = '/foo/bar/error_file'
@@ -170,7 +172,7 @@ class NodeContextTestCase(unittest.TestCase):
     def test__get_physical_nodes(self):
         self.test_context.init(self.attrs)
         nodes = self.test_context._get_physical_nodes()
-        self.assertEquals(nodes, self.test_context.nodes)
+        self.assertEqual(nodes, self.test_context.nodes)
 
     def test__get_physical_node_for_server(self):
         self.test_context.init(self.attrs)
@@ -198,7 +200,7 @@ class NodeContextTestCase(unittest.TestCase):
         node_collectd_options = [node for node in self.test_context.nodes
                                  if node['name'] == 'node1'][0]['collectd']
 
-        self.assertEquals(node_collectd_options, options)
+        self.assertEqual(node_collectd_options, options)
 
     @mock.patch('{}.NodeContext._dispatch_script'.format(PREFIX))
     def test_deploy(self, dispatch_script_mock):