summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-18 12:35:00 +0100
committerSoren Hansen <soren@linux2go.dk>2011-03-18 12:35:00 +0100
commitaa0d218e53afeb4403f0be2cf5251acb5efafc04 (patch)
tree3a0b2b715b3f229c6bea83345d4d14bb024278c7 /nova
parent9eb64af0d7182f19fd7eda75371e202022f79891 (diff)
parentccbc8f6464ce2da0fd62e154a86b51b1110afb6f (diff)
Merge lp:~anso/nova/smoketests_fixes
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/api/openstack/test_servers.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 03e00af2a..ef8b7c65a 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1134,5 +1134,3 @@ class TestServerInstanceCreation(test.TestCase):
self.assertTrue(server.getAttribute('adminPass').startswith('fake'))
-if __name__ == "__main__":
- unittest.main()