rebased with upstream and reolved merge conflicts

1 files changed, 4 insertions, 6 deletions

diff --git a/tests/unittests/test_handler/test_handler_timezone.py b/tests/unittests/test_handler/test_handler_timezone.py
index e3df8759..b7e6b03d 100644
--- a/tests/unittests/test_handler/test_handler_timezone.py
+++ b/tests/unittests/test_handler/test_handler_timezone.py
@@ -28,12 +28,10 @@ from cloudinit.sources import DataSourceNoCloud
 from .. import helpers as t_help
 
 from configobj import ConfigObj
-
-from six import BytesIO
-
+import logging
 import shutil
+from six import BytesIO
 import tempfile
-import logging
 
 LOG = logging.getLogger(__name__)
 
@@ -72,7 +70,7 @@ class TestTimezone(t_help.FilesystemMockingTestCase):
 
         contents = util.load_file('/etc/sysconfig/clock', decode=False)
         n_cfg = ConfigObj(BytesIO(contents))
-        self.assertEquals({'TIMEZONE': cfg['timezone']}, dict(n_cfg))
+        self.assertEqual({'TIMEZONE': cfg['timezone']}, dict(n_cfg))
 
         contents = util.load_file('/etc/localtime')
-        self.assertEquals(dummy_contents, contents.strip())
+        self.assertEqual(dummy_contents, contents.strip())