openstack/swift
Code Issues Proposed changes

Merge "Fix timing test error when rebalancing"

Browse Source
This commit is contained in:
Jenkins 2017-02-08 13:35:35 +00:00 committed by Gerrit Code Review
commit 2ffad93226
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/cli/test_ringbuilder.py
View File

@ -1889,9 +1889,9 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin):
def test_time_remaining(self): def test_time_remaining(self):
self.create_sample_ring() self.create_sample_ring()
self.run_srb('rebalance')
now = time.time() now = time.time()
with mock.patch('swift.common.ring.builder.time', return_value=now): with mock.patch('swift.common.ring.builder.time', return_value=now):
self.run_srb('rebalance')
out, err = self.run_srb('rebalance') out, err = self.run_srb('rebalance')
self.assertIn('No partitions could be reassigned', out) self.assertIn('No partitions could be reassigned', out)
self.assertIn('must be at least min_part_hours', out) self.assertIn('must be at least min_part_hours', out)