Code review comment for lp:~soren/nova/ec2-security-groups

problem running multiple tests, it may not be instance i-1. This patch fixes.

=== modified file 'nova/tests/virt_unittest.py'
--- nova/tests/virt_unittest.py 2010-09-28 08:26:29 +0000
+++ nova/tests/virt_unittest.py 2010-09-28 17:47:54 +0000
@@ -178,8 +178,14 @@
             self.defined_filters.append(name)
             return True

+ self.fake_libvirt_connection.nwfilterDefineXML = _filterDefineXMLMock
+
+ instance_ref = db.instance_create({}, {'user_id': 'fake',
+ 'project_id': 'fake'})
+ inst_id = instance_ref['id']
+
         def _ensure_all_called(_):
- instance_filter = 'nova-instance-i-1'
+ instance_filter = 'nova-instance-%s' % instance_ref['str_id']
             secgroup_filter = 'nova-secgroup-%s' % self.security_group['id']
             for required in [secgroup_filter, 'allow-dhcp-server',
                              'no-arp-spoofing', 'no-ip-spoofing',
@@ -187,11 +193,6 @@
                 self.assertTrue(required in self.recursive_depends[instance_filter],
                             "Instance's filter does not include %s" % required)

- self.fake_libvirt_connection.nwfilterDefineXML = _filterDefineXMLMock
-
- inst_id = db.instance_create({}, {'user_id': 'fake',
- 'project_id': 'fake'})['id']
-
         self.security_group = self.setup_and_return_security_group()

         db.instance_add_security_group({}, inst_id, self.security_group.id)