pull-up from trunk; fix problem obscuring context module with context param; fix conflicts and no-longer-skipped tests

2011-07-29 18:59:33 +00:00
parent c0355038b4 ab0c38efa5
commit 62c7ca622a
29 changed files with 1449 additions and 462 deletions
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -239,7 +239,7 @@ class LibvirtConnTestCase(test.TestCase):
                    'mac_address': 'fake',
                    'ip_address': 'fake',
                    'dhcp_server': 'fake',
-                    'extra_params': 'fake'
+                    'extra_params': 'fake',
                }

        # Creating mocks