diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-02-15 15:09:52 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-15 15:09:52 +0000 |
| commit | 2effeaf2905ded6c03116ed05fca4dbb0eabe955 (patch) | |
| tree | a5d9cdf5adce0cf5d7a771b7e59ff75f155785ad /nova | |
| parent | af2da1311e21aced75d80c95bffbd26106be90df (diff) | |
| parent | bf8d9d3adfcb5e5cd97ae0d7451e6253892622b1 (diff) | |
| download | nova-2effeaf2905ded6c03116ed05fca4dbb0eabe955.tar.gz nova-2effeaf2905ded6c03116ed05fca4dbb0eabe955.tar.xz nova-2effeaf2905ded6c03116ed05fca4dbb0eabe955.zip | |
Fix sporadically failing unittests.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/test_api.py | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index 2569e262b..fa27825cd 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -248,16 +248,14 @@ class ApiEc2TestCase(test.TestCase): self.mox.ReplayAll() rv = self.ec2.get_all_security_groups() - # I don't bother checkng that we actually find it here, - # because the create/delete unit test further up should - # be good enough for that. - for group in rv: - if group.name == security_group_name: - self.assertEquals(len(group.rules), 1) - self.assertEquals(int(group.rules[0].from_port), 80) - self.assertEquals(int(group.rules[0].to_port), 81) - self.assertEquals(len(group.rules[0].grants), 1) - self.assertEquals(str(group.rules[0].grants[0]), '0.0.0.0/0') + + group = [grp for grp in rv if grp.name == security_group_name][0] + + self.assertEquals(len(group.rules), 1) + self.assertEquals(int(group.rules[0].from_port), 80) + self.assertEquals(int(group.rules[0].to_port), 81) + self.assertEquals(len(group.rules[0].grants), 1) + self.assertEquals(str(group.rules[0].grants[0]), '0.0.0.0/0') self.expect_http() self.mox.ReplayAll() @@ -314,16 +312,13 @@ class ApiEc2TestCase(test.TestCase): self.mox.ReplayAll() rv = self.ec2.get_all_security_groups() - # I don't bother checkng that we actually find it here, - # because the create/delete unit test further up should - # be good enough for that. - for group in rv: - if group.name == security_group_name: - self.assertEquals(len(group.rules), 1) - self.assertEquals(int(group.rules[0].from_port), 80) - self.assertEquals(int(group.rules[0].to_port), 81) - self.assertEquals(len(group.rules[0].grants), 1) - self.assertEquals(str(group.rules[0].grants[0]), '::/0') + + group = [grp for grp in rv if grp.name == security_group_name][0] + self.assertEquals(len(group.rules), 1) + self.assertEquals(int(group.rules[0].from_port), 80) + self.assertEquals(int(group.rules[0].to_port), 81) + self.assertEquals(len(group.rules[0].grants), 1) + self.assertEquals(str(group.rules[0].grants[0]), '::/0') self.expect_http() self.mox.ReplayAll() |