From d70f22ee1b22e84a974e1b44b3e0b87bfe06a855 Mon Sep 17 00:00:00 2001 From: Yuming Zhu Date: Oct 18 2018 12:37:35 +0000 Subject: fix timezone in test_list_tagged --- diff --git a/tests/test_builder/test_build_notification.py b/tests/test_builder/test_build_notification.py index 6b3241f..7bff6c1 100644 --- a/tests/test_builder/test_build_notification.py +++ b/tests/test_builder/test_build_notification.py @@ -8,6 +8,8 @@ try: import unittest2 as unittest except ImportError: import unittest +import time + import koji import koji.util from .loadkojid import kojid @@ -55,6 +57,7 @@ class TestBuildNotification(unittest.TestCase): def setUp(self): self.original_timezone = os.environ.get('TZ') os.environ['TZ'] = 'US/Eastern' + time.tzset() self.tempdir = tempfile.mkdtemp() self.SMTP = mock.patch('smtplib.SMTP').start() self.session = mock.MagicMock() @@ -67,6 +70,7 @@ class TestBuildNotification(unittest.TestCase): del os.environ['TZ'] else: os.environ['TZ'] = self.original_timezone + time.tzset() mock.patch.stopall() def test_build_notification(self): diff --git a/tests/test_cli/test_list_tagged.py b/tests/test_cli/test_list_tagged.py index f8fc91e..8a9a956 100644 --- a/tests/test_cli/test_list_tagged.py +++ b/tests/test_cli/test_list_tagged.py @@ -1,4 +1,6 @@ import sys +import os +import time import mock @@ -11,6 +13,9 @@ class TestCliListTagged(utils.CliTestCase): maxDiff = None def setUp(self): + self.original_timezone = os.environ.get('TZ') + os.environ['TZ'] = 'US/Eastern' + time.tzset() self.error_format = """Usage: %s list-tagged [options] tag [package] (Specify the --help global option for a list of other help options) @@ -48,6 +53,13 @@ class TestCliListTagged(utils.CliTestCase): 'tag_name': 'tag', 'owner_name': 'owner'}] + def tearDown(self): + if self.original_timezone is None: + del os.environ['TZ'] + else: + os.environ['TZ'] = self.original_timezone + time.tzset() + @mock.patch('koji.util.eventFromOpts', return_value={'id': 1000, 'ts': 1000000.11}) @mock.patch('koji_cli.commands.activate_session') @@ -66,7 +78,7 @@ class TestCliListTagged(utils.CliTestCase): package='pkg') self.session.listTaggedRPMS.assert_not_called() self.assert_console_message(sys.stdout, - 'Querying at event 1000 (Mon Jan 12 13:46:40 1970)\n' + 'Querying at event 1000 (Mon Jan 12 08:46:40 1970)\n' 'Build Tag Built by\n' '---------------------------------------- -------------------- ----------------\n' 'n-v-r tag owner\n')