summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2012-11-12 10:11:06 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2012-11-13 08:59:50 +0800
commit426315ff0396bc87b05da77021f7368a38ee085b (patch)
tree801b57bc2ba900c729e94c28b688f05bd7eaea3a
parent9892d001303512160387e3d451064bc7efc7a32a (diff)
downloadnova-426315ff0396bc87b05da77021f7368a38ee085b.tar.gz
nova-426315ff0396bc87b05da77021f7368a38ee085b.tar.xz
nova-426315ff0396bc87b05da77021f7368a38ee085b.zip
Clean up __main__ execution from two tests for consistency
We can run individual tests with nose, and most of the tests in the tree don't include __main__ sections. This patch cleans up the two oddball cases for consistency. Change-Id: I78860e1b651982279944c7cf2caff251b9feee90
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_server_start_stop.py4
-rw-r--r--nova/tests/integrated/test_servers.py4
2 files changed, 0 insertions, 8 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py b/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py
index e0d3cbb0f..fb912d0c4 100644
--- a/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py
+++ b/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py
@@ -64,7 +64,3 @@ class ServerStartStopTest(test.TestCase):
body = dict(start="")
self.assertRaises(webob.exc.HTTPNotFound,
self.controller._stop_server, req, 'test_inst', body)
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py
index 0c9024a8a..d971af4f4 100644
--- a/nova/tests/integrated/test_servers.py
+++ b/nova/tests/integrated/test_servers.py
@@ -434,7 +434,3 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
self._delete_server(created_server_id)
for server_id in server_map.iterkeys():
self._delete_server(server_id)
-
-
-if __name__ == "__main__":
- unittest.main()