cleanup

2 files changed, 20 insertions, 5 deletions

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index ff6f5d13a..719c4592b 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1289,7 +1289,6 @@ class ServersTest(test.TestCase):
 
         res = req.get_response(fakes.wsgi_app())
 
-        print res.body
         self.assertEqual(res.status_int, 200)
         server = json.loads(res.body)['server']
         self.assertEqual(16, len(server['adminPass']))
@@ -1384,7 +1383,6 @@ class ServersTest(test.TestCase):
 
         res = req.get_response(fakes.wsgi_app())
 
-        print res.body
         self.assertEqual(res.status_int, 200)
         server = json.loads(res.body)['server']
         self.assertEqual(expected_flavor, server['flavor'])
@@ -1429,11 +1427,8 @@ class ServersTest(test.TestCase):
         req.method = 'POST'
         req.body = json.dumps(body)
         req.headers['content-type'] = "application/json"
-
         res = req.get_response(fakes.wsgi_app())
-
         self.assertEqual(res.status_int, 200)
-
         server = json.loads(res.body)['server']
         self.assertEqual(server['adminPass'], body['server']['adminPass'])
 
diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py
index fcb517cf5..67b3c485a 100644
--- a/nova/tests/integrated/test_servers.py
+++ b/nova/tests/integrated/test_servers.py
@@ -285,6 +285,26 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
         # Cleanup
         self._delete_server(created_server_id)
 
+    def test_rename_server(self):
+        """Test building and renaming a server."""
+
+        # Create a server
+        server = self._build_minimal_create_server_request()
+        created_server = self.api.post_server({'server': server})
+        LOG.debug("created_server: %s" % created_server)
+        server_id = created_server['id']
+        self.assertTrue(server_id)
+
+        # Rename the server to 'new-name'
+        self.api.put_server(server_id, {'server': {'name': 'new-name'}})
+
+        # Check the name of the server
+        created_server = self.api.get_server(server_id)
+        self.assertEqual(created_server['name'], 'new-name')
+
+        # Cleanup
+        self._delete_server(server_id)
+
 
 if __name__ == "__main__":
     unittest.main()