commit e6d8ee1cf880c2e65db94228452fca98c65645ca
author James E. Blair <corvus@inaugust.com> Fri Jan 18 21:33:45 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jan 18 21:33:45 2013 +0000
tree 6c1bfb00477f25de035e050bf94b7cba546231c2
parent 58dec9d45360a69192fc6ba43dddf5a597063972

Revert "Split up XML and JSON testing."

This reverts commit 58dec9d45360a69192fc6ba43dddf5a597063972

This ended gating of the XML API without any real public deliberation.  It should be reverted, and a plan agreed upon with PTLs and the CI team.

Also, if we do decide to implement this, we should make the CI change _first_ so that we don't abruptly stop gating on something we should be testing.

tempest/tests/compute/servers/test_console_output.py

diff --git a/tempest/tests/compute/servers/test_console_output.py b/tempest/tests/compute/servers/test_console_output.py
index 34ff614..3ad29a1 100644
--- a/tempest/tests/compute/servers/test_console_output.py
+++ b/tempest/tests/compute/servers/test_console_output.py
@@ -23,7 +23,7 @@
 from tempest.tests.compute import base
 
 
-class ConsoleOutputTestBase(object):
+class ConsoleOutputTest(object):
 
     @classmethod
     def setUpClass(self, cls):
@@ -87,13 +87,28 @@
 
 
 @attr(type='smoke')
-class ConsoleOutputTest(base.BaseCompTest, ConsoleOutputTestBase):
+class ConsoleOutputTestJSON(base.BaseComputeTestJSON,
+                            ConsoleOutputTest):
     @classmethod
     def setUpClass(cls):
-        super(ConsoleOutputTest, cls).setUpClass()
-        ConsoleOutputTestBase.setUpClass(cls)
+        super(ConsoleOutputTestJSON, cls).setUpClass()
+        ConsoleOutputTest.setUpClass(cls)
 
     @classmethod
     def tearDownClass(cls):
-        ConsoleOutputTestBase.tearDownClass(cls)
-        super(ConsoleOutputTest, cls).tearDownClass()
+        ConsoleOutputTest.tearDownClass(cls)
+        super(ConsoleOutputTestJSON, cls).tearDownClass()
+
+
+@attr(type='smoke')
+class ConsoleOutputTestXML(base.BaseComputeTestXML,
+                           ConsoleOutputTest):
+    @classmethod
+    def setUpClass(cls):
+        super(ConsoleOutputTestXML, cls).setUpClass()
+        ConsoleOutputTest.setUpClass(cls)
+
+    @classmethod
+    def tearDownClass(cls):
+        ConsoleOutputTest.tearDownClass(cls)
+        super(ConsoleOutputTestXML, cls).tearDownClass()