openstack/python-openstackclient
Code Issues Proposed changes

Merge "remove py26 workaround in osc"

Browse Source
This commit is contained in:
Jenkins 2016-03-09 16:40:46 +00:00 committed by Gerrit Code Review
commit 46f58dc173
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openstackclient/tests/utils.py
View File

@ -17,7 +17,6 @@
import os import os
import fixtures import fixtures
import sys
import testtools import testtools
from openstackclient.tests import fakes from openstackclient.tests import fakes
@ -50,29 +49,6 @@ class TestCase(testtools.TestCase):
msg = 'method %s should not have been called' % m msg = 'method %s should not have been called' % m
self.fail(msg) self.fail(msg)
# 2.6 doesn't have the assert dict equals so make sure that it exists
if tuple(sys.version_info)[0:2] < (2, 7):
def assertIsInstance(self, obj, cls, msg=None):
"""self.assertTrue(isinstance(obj, cls)), with a nicer message"""
if not isinstance(obj, cls):
standardMsg = '%s is not an instance of %r' % (obj, cls)
self.fail(self._formatMessage(msg, standardMsg))
def assertDictEqual(self, d1, d2, msg=None):
# Simple version taken from 2.7
self.assertIsInstance(d1, dict,
'First argument is not a dictionary')
self.assertIsInstance(d2, dict,
'Second argument is not a dictionary')
if d1 != d2:
if msg:
self.fail(msg)
else:
standardMsg = '%r != %r' % (d1, d2)
self.fail(standardMsg)
class TestCommand(TestCase): class TestCommand(TestCase):
"""Test cliff command classes""" """Test cliff command classes"""