diff options
| author | Yaguang Tang <yaguang.tang@canonical.com> | 2013-05-20 18:05:30 +0800 |
|---|---|---|
| committer | Yaguang Tang <yaguang.tang@canonical.com> | 2013-05-27 12:32:45 +0800 |
| commit | 4f44cd9129f094d88dfddfa5885c453590ac847c (patch) | |
| tree | 35b8cfb882c56dd742d21220ee814a0d22914d27 /nova/tests | |
| parent | e06ab5877462c83f6574b0304331e3ff906ddb14 (diff) | |
| download | nova-4f44cd9129f094d88dfddfa5885c453590ac847c.tar.gz nova-4f44cd9129f094d88dfddfa5885c453590ac847c.tar.xz nova-4f44cd9129f094d88dfddfa5885c453590ac847c.zip | |
Fix config drive code logical error.
Image id has changed to uuid, so bool value can't be a image ID
any more, remove unnecessary test code.
fix bug #1181991
Change-Id: I420e4cdb848401375b347d43e06343efaa7bf5fc
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index f5c23ccee..a02a5ad6e 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -8989,21 +8989,13 @@ class CheckConfigDriveTestCase(test.TestCase): self.assertCheck((None, None), None) self.assertFalse(self.called['show']) - def test_value_is_bool_like_string(self): - self.assertCheck((None, 'True'), 'True') - self.assertCheck((None, 'yes'), 'yes') - def test_bool_string_or_id(self): - # NOTE(sirp): '0' and '1' could be a bool value or an ID. Since there - # are many other ways to specify bools (e.g. 't', 'f'), it's better to - # treat as an ID. - self.assertCheck((0, None), 0) - self.assertCheck((1, None), 1) - self.assertCheck(('0', None), '0') - self.assertCheck(('1', None), '1') + self.assertCheck((None, True), "true") + self.assertCheck((None, True), 1) + self.assertCheck((None, True), 't') def test_value_is_image_id(self): - self.assertCheck((2, None), 2) + self.assertCheck(("fake-uuid", None), "fake-uuid") class CheckRequestedImageTestCase(test.TestCase): |