From 58d781259641d3fc64adb2bfb31d603dc04159bf Mon Sep 17 00:00:00 2001 From: Clay Gerrard Date: Fri, 30 Jun 2017 16:45:43 -0700 Subject: [PATCH] fix flakey time for test_default_sorted_output Change-Id: Ib7f0c22336e8354d4f46e2343149495bef382f9c --- test/unit/cli/test_ringbuilder.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/unit/cli/test_ringbuilder.py b/test/unit/cli/test_ringbuilder.py index 96eded2fac..19257af014 100644 --- a/test/unit/cli/test_ringbuilder.py +++ b/test/unit/cli/test_ringbuilder.py @@ -1759,6 +1759,7 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin): mock_stderr = six.StringIO() # Create a sample ring and remove/add some devices. + now = time.time() ring = self.create_sample_ring() argv = ["", self.tmpfile, "add", "--region", "1", "--zone", "2", @@ -1784,9 +1785,10 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin): # Check the order of the devices listed the output. argv = ["", self.tmpfile] - with mock.patch("sys.stdout", mock_stdout): - with mock.patch("sys.stderr", mock_stderr): - self.assertRaises(SystemExit, ringbuilder.main, argv) + with mock.patch("sys.stdout", mock_stdout), mock.patch( + "sys.stderr", mock_stderr), mock.patch( + 'swift.common.ring.builder.time', return_value=now): + self.assertRaises(SystemExit, ringbuilder.main, argv) self.assertOutputStub(mock_stdout.getvalue(), builder_id=ring.id) def test_default_ringfile_check(self):