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/admin/test_flavors.py

diff --git a/tempest/tests/compute/admin/test_flavors.py b/tempest/tests/compute/admin/test_flavors.py
index eb873bd..8172bd4 100644
--- a/tempest/tests/compute/admin/test_flavors.py
+++ b/tempest/tests/compute/admin/test_flavors.py
@@ -19,12 +19,9 @@
 from nose.plugins.attrib import attr
 import unittest2 as unittest
 
-from tempest import config
 from tempest.tests import compute
 from tempest.tests.compute import base
 
-CONF = config.TempestConfig()
-
 
 class FlavorsAdminTestBase(object):
 
@@ -71,12 +68,12 @@
             self.assertEqual(flavor['rxtx_factor'], self.rxtx)
             self.assertEqual(flavor['OS-FLV-EXT-DATA:ephemeral'],
                              self.ephemeral)
-            if CONF.general.use_xml:
+            if self._interface == "xml":
                 XMLNS_OS_FLV_ACCESS = "http://docs.openstack.org/compute/ext/"\
                     "flavor_access/api/v2"
                 key = "{" + XMLNS_OS_FLV_ACCESS + "}is_public"
                 self.assertEqual(flavor[key], "True")
-            else:
+            if self._interface == "json":
                 self.assertEqual(flavor['os-flavor-access:is_public'], True)
 
             #Verify flavor is retrieved
@@ -167,12 +164,12 @@
             self.assertEqual(flavor['swap'], '')
             self.assertEqual(int(flavor['rxtx_factor']), 1)
             self.assertEqual(int(flavor['OS-FLV-EXT-DATA:ephemeral']), 0)
-            if CONF.general.use_xml:
+            if self._interface == "xml":
                 XMLNS_OS_FLV_ACCESS = "http://docs.openstack.org/compute/ext/"\
                     "flavor_access/api/v2"
                 key = "{" + XMLNS_OS_FLV_ACCESS + "}is_public"
                 self.assertEqual(flavor[key], "True")
-            else:
+            if self._interface == "json":
                 self.assertEqual(flavor['os-flavor-access:is_public'], True)
 
             #Verify flavor is retrieved
@@ -244,11 +241,23 @@
             self.client.wait_for_resource_deletion(self.new_flavor_id)
 
 
-class FlavorsAdminTest(base.BaseComputeAdminTest, base.BaseCompTest,
-                       FlavorsAdminTestBase):
+class FlavorsAdminTestXML(base.BaseComputeAdminTestXML,
+                          base.BaseComputeTestXML,
+                          FlavorsAdminTestBase):
 
     @classmethod
     def setUpClass(cls):
-        super(FlavorsAdminTest, cls).setUpClass()
-        base.BaseCompTest.setUpClass()
+        super(FlavorsAdminTestXML, cls).setUpClass()
+        base.BaseComputeTestXML.setUpClass()
+        FlavorsAdminTestBase.setUpClass(cls)
+
+
+class FlavorsAdminTestJSON(base.BaseComputeAdminTestJSON,
+                           base.BaseComputeTestJSON,
+                           FlavorsAdminTestBase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(FlavorsAdminTestJSON, cls).setUpClass()
+        base.BaseComputeTestJSON.setUpClass()
         FlavorsAdminTestBase.setUpClass(cls)