commit 011164b23210648694ae57afabad430016ed870f
author Dan Smith <danms@us.ibm.com> Tue Aug 14 09:06:06 2012 -0700
committer Vincent Hou <sbhou@cn.ibm.com> Fri Aug 24 19:34:29 2012 +0800
tree 39ca133a897239f78d788f99cdd0988b557218eb
parent cf8fab6b5a63884f82f2ecbfe7550888bef8a1a9

Add XML support for test_servers.py

Change-Id: I94f73c6592916fbf5cdf766bb7ac1874369711b9

tempest/tests/compute/test_servers.py

diff --git a/tempest/tests/compute/test_servers.py b/tempest/tests/compute/test_servers.py
index 6f2f24c..18e92da 100644
--- a/tempest/tests/compute/test_servers.py
+++ b/tempest/tests/compute/test_servers.py
@@ -18,15 +18,10 @@
 from nose.plugins.attrib import attr
 
 from tempest.common.utils.data_utils import rand_name
-from tempest.tests.compute.base import BaseComputeTest
+from tempest.tests.compute import base
 
 
-class ServersTest(BaseComputeTest):
-
-    @classmethod
-    def setUpClass(cls):
-        super(ServersTest, cls).setUpClass()
-        cls.client = cls.servers_client
+class ServersTestBase(object):
 
     @attr(type='positive')
     def test_create_server_with_admin_password(self):
@@ -153,3 +148,17 @@
         self.client.wait_for_server_status(server['id'], 'BUILD')
         resp, _ = self.client.delete_server(server['id'])
         self.assertEqual('204', resp['status'])
+
+
+class ServersTestJSON(base.BaseComputeTestJSON, ServersTestBase):
+    @classmethod
+    def setUpClass(cls):
+        super(ServersTestJSON, cls).setUpClass()
+        cls.client = cls.servers_client
+
+
+class ServersTestXML(base.BaseComputeTestXML, ServersTestBase):
+    @classmethod
+    def setUpClass(cls):
+        super(ServersTestXML, cls).setUpClass()
+        cls.client = cls.servers_client