Merge "Disable XML tests on Py26"
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
import contextlib
|
import contextlib
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
import eventlet.timeout
|
import eventlet.timeout
|
||||||
import fixtures
|
import fixtures
|
||||||
@@ -117,6 +118,9 @@ class BaseTestCase(testtools.TestCase):
|
|||||||
'neutron.common.exceptions.NeutronException.use_fatal_exceptions',
|
'neutron.common.exceptions.NeutronException.use_fatal_exceptions',
|
||||||
fake_use_fatal_exceptions))
|
fake_use_fatal_exceptions))
|
||||||
|
|
||||||
|
if sys.version_info < (2, 7) and getattr(self, 'fmt', '') == 'xml':
|
||||||
|
raise self.skipException('XML Testing Skipped in Py26')
|
||||||
|
|
||||||
def config(self, **kw):
|
def config(self, **kw):
|
||||||
"""Override some configuration values.
|
"""Override some configuration values.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user