diff options
| author | Zhao Chao <zhaochao1984@gmail.com> | 2018-02-26 13:45:50 +0800 |
|---|---|---|
| committer | Zhao Chao <zhaochao1984@gmail.com> | 2018-02-26 15:17:58 +0800 |
| commit | 3519434b5b78b1422d0f24c4dbdcb68dcf2d2f4d (patch) | |
| tree | 85096fcacbd7a9c4e63ac4607b3a5bf2c9a807c2 /integration/tests | |
| parent | d6bd37f3f337b1756730c55164834a18c86e7018 (diff) | |
| download | trove-3519434b5b78b1422d0f24c4dbdcb68dcf2d2f4d.tar.gz | |
Fix incorrect usage of assertTrue
Previously assertTrue is incorrectly used as assertEqual or
assertIsNotNone, this patch fixes. Some assertEqual around the changes
introduced by this patch are also updated to use the proper arguments
convention, from
assertEqual(observed, expected)
to
assertEqual(expected, observed)
Change-Id: If1d75a850594eff72b69e265a25505382e82022b
Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>
Diffstat (limited to 'integration/tests')
| -rw-r--r-- | integration/tests/integration/tests/volumes/driver.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/integration/tests/integration/tests/volumes/driver.py b/integration/tests/integration/tests/volumes/driver.py index 340b721c..3e084597 100644 --- a/integration/tests/integration/tests/volumes/driver.py +++ b/integration/tests/integration/tests/volumes/driver.py @@ -217,8 +217,8 @@ class AddVolumeFailure(VolumeTest): snapshot_id=None, name=name, description=desc) self.assertEqual(HUGE_VOLUME, volume["size"]) - self.assertTrue("creating", volume["status"]) - self.assertTrue("detached", volume["attach_status"]) + self.assertEqual("creating", volume["status"]) + self.assertEqual("detached", volume["attach_status"]) self.storyFail.volume = volume self.storyFail.volume_id = volume["id"] @@ -236,8 +236,8 @@ class AfterVolumeFailureIsAdded(VolumeTest): """Wait until the volume is a FAILURE.""" volume = poll_until(lambda: self.storyFail.get_volume(), lambda volume: volume["status"] != "creating") - self.assertEqual(volume["status"], "error") - self.assertTrue(volume["attach_status"], "detached") + self.assertEqual("error", volume["status"]) + self.assertEqual("detached", volume["attach_status"]) @time_out(60) def test_mgmt_volume_check(self): @@ -267,8 +267,8 @@ class AddVolume(VolumeTest): snapshot_id=None, name=name, description=desc) self.assert_volume_as_expected(volume) - self.assertTrue("creating", volume["status"]) - self.assertTrue("detached", volume["attach_status"]) + self.assertEqual("creating", volume["status"]) + self.assertEqual("detached", volume["attach_status"]) self.story.volume = volume self.story.volume_id = volume["id"] @@ -286,9 +286,9 @@ class AfterVolumeIsAdded(VolumeTest): """Wait until the volume is finished provisioning.""" volume = poll_until(lambda: self.story.get_volume(), lambda volume: volume["status"] != "creating") - self.assertEqual(volume["status"], "available") + self.assertEqual("available", volume["status"]) self.assert_volume_as_expected(volume) - self.assertTrue(volume["attach_status"], "detached") + self.assertEqual("detached", volume["attach_status"]) @time_out(60) def test_mgmt_volume_check(self): @@ -404,9 +404,9 @@ class ResizeVolume(VolumeTest): volume = poll_until(lambda: self.story.get_volume(), lambda volume: volume["status"] == "resized") - self.assertEqual(volume["status"], "resized") - self.assertTrue(volume["attach_status"], "attached") - self.assertTrue(volume['size'], self.story.resize_volume_size) + self.assertEqual("resized", volume["status"]) + self.assertEqual("attached", volume["attach_status"]) + self.assertEqual(self.story.resize_volume_size, volume['size']) @time_out(300) def test_resizefs_rescan(self): |