Merge "add error logs to storperf"

[yardstick.git] / yardstick / tests / unit / common / test_yaml_loader.py

diff --git a/yardstick/tests/unit/common/test_yaml_loader.py b/yardstick/tests/unit/common/test_yaml_loader.py
index 90cbb81..e621dcb 100644 (file)
--- a/yardstick/tests/unit/common/test_yaml_loader.py
+++ b/yardstick/tests/unit/common/test_yaml_loader.py
@@ -12,7 +12,6 @@
 
 # yardstick: this file is copied from python-heatclient and slightly modified
 
-from __future__ import absolute_import
 import unittest
 
 from yardstick.common import yaml_loader
@@ -22,11 +21,4 @@ class TemplateFormatTestCase(unittest.TestCase):
 
     def test_parse_to_value_exception(self):
 
-        self.assertEquals(yaml_loader.yaml_load("string"), u"string")
-
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()
+        self.assertEqual(yaml_loader.yaml_load("string"), u"string")