Merge lp:~soren/nova/fix-unittest into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Fix sporadically failing unittests.

It turns out the failing unittests from the last couple of days weren't racy. They were caused by a difference in ordering depending on the randomly chosen name for the security group used in the tests.

This patch makes sure that we're working on the right groups in the latter half these unit tests.

[Ed Leafe (ed-leafe)]

This might be cleaner:

group = [grp for grp in rv if grp.name == security_group_name][0]

It eliminates the iteration loop, and would have avoided the problem in the first place.

[Soren Hansen (soren)]

2011/2/15 Ed Leafe <email address hidden>:
> This might be cleaner:
>
> group = [grp for grp in rv if grp.name == security_group_name][0]
>
> It eliminates the iteration loop, and would have avoided the problem in the first place.

Yup, looks good. Thanks.

--
Soren Hansen        | http://linux2go.dk/
Ubuntu Developer    | http://www.ubuntu.com/
OpenStack Developer | http://www.openstack.org/

[lp:~soren/nova/fix-unittest]

673. By Soren Hansen on 2011-02-15

Beautify it a little bit, thanks to dabo.

[Thierry Carrez (ttx)]

Let's get rid of random test failures

review: Approve

[Ed Leafe (ed-leafe)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

aw, random test failures are just so much fun to diagnose, though...

review: Approve

=== modified file 'nova/tests/test_api.py'
--- nova/tests/test_api.py	2011-01-27 14:45:24 +0000
+++ nova/tests/test_api.py	2011-02-15 12:22:10 +0000
@@ -248,16 +248,14 @@
         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 @@
         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()