openstack/python-troveclient
Code Issues Proposed changes

Merge "Replace assertEqual(None, *) with assertIsNone in tests"

Browse Source
This commit is contained in:
Jenkins
2014-03-03 09:45:19 +00:00
committed by Gerrit Code Review
parent 59ec2bb433 ae837cf057
commit 24281a1ab5
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
troveclient/compat/tests/test_common.py
View File

@@ -91,19 +91,19 @@ class CommonTest(testtools.TestCase):
class CliOptionsTest(testtools.TestCase): class CliOptionsTest(testtools.TestCase):
def check_default_options(self, co): def check_default_options(self, co):
self.assertEqual(None, co.username) self.assertIsNone(co.username)
self.assertEqual(None, co.apikey) self.assertIsNone(co.apikey)
self.assertEqual(None, co.tenant_id) self.assertIsNone(co.tenant_id)
self.assertEqual(None, co.auth_url) self.assertIsNone(co.auth_url)
self.assertEqual('keystone', co.auth_type) self.assertEqual('keystone', co.auth_type)
self.assertEqual('database', co.service_type) self.assertEqual('database', co.service_type)
self.assertEqual('RegionOne', co.region) self.assertEqual('RegionOne', co.region)
self.assertEqual(None, co.service_url) self.assertIsNone(co.service_url)
self.assertFalse(co.insecure) self.assertFalse(co.insecure)
self.assertFalse(co.verbose) self.assertFalse(co.verbose)
self.assertFalse(co.debug) self.assertFalse(co.debug)
self.assertEqual(None, co.token) self.assertIsNone(co.token)
self.assertEqual(None, co.xml) self.assertIsNone(co.xml)
def check_option(self, oparser, option_name): def check_option(self, oparser, option_name):
option = oparser.get_option("--%s" % option_name) option = oparser.get_option("--%s" % option_name)
@@ -186,7 +186,7 @@ class CommandsBaseTest(testtools.TestCase):
func = mock.Mock(side_effect=ValueError) # an arbitrary exception func = mock.Mock(side_effect=ValueError) # an arbitrary exception
r = self.cmd_base._safe_exec(func) r = self.cmd_base._safe_exec(func)
self.assertEqual(None, r) self.assertIsNone(r)
def test__prepare_parser(self): def test__prepare_parser(self):
parser = optparse.OptionParser() parser = optparse.OptionParser()
@@ -226,9 +226,9 @@ class CommandsBaseTest(testtools.TestCase):
def test__pretty_print(self): def test__pretty_print(self):
func = mock.Mock(return_value=None) func = mock.Mock(return_value=None)
self.cmd_base.verbose = True self.cmd_base.verbose = True
self.assertEqual(None, self.cmd_base._pretty_print(func)) self.assertIsNone(self.cmd_base._pretty_print(func))
self.cmd_base.verbose = False self.cmd_base.verbose = False
self.assertEqual(None, self.cmd_base._pretty_print(func)) self.assertIsNone(self.cmd_base._pretty_print(func))
def test__dumps(self): def test__dumps(self):
json.dumps = mock.Mock(return_value="test-dump") json.dumps = mock.Mock(return_value="test-dump")
@@ -237,19 +237,19 @@ class CommandsBaseTest(testtools.TestCase):
def test__pretty_list(self): def test__pretty_list(self):
func = mock.Mock(return_value=None) func = mock.Mock(return_value=None)
self.cmd_base.verbose = True self.cmd_base.verbose = True
self.assertEqual(None, self.cmd_base._pretty_list(func)) self.assertIsNone(self.cmd_base._pretty_list(func))
self.cmd_base.verbose = False self.cmd_base.verbose = False
self.assertEqual(None, self.cmd_base._pretty_list(func)) self.assertIsNone(self.cmd_base._pretty_list(func))
item = mock.Mock(return_value="test") item = mock.Mock(return_value="test")
item._info = "info" item._info = "info"
func = mock.Mock(return_value=[item]) func = mock.Mock(return_value=[item])
self.assertEqual(None, self.cmd_base._pretty_list(func)) self.assertIsNone(self.cmd_base._pretty_list(func))
def test__pretty_paged(self): def test__pretty_paged(self):
self.cmd_base.limit = "5" self.cmd_base.limit = "5"
func = mock.Mock(return_value=None) func = mock.Mock(return_value=None)
self.cmd_base.verbose = True self.cmd_base.verbose = True
self.assertEqual(None, self.cmd_base._pretty_paged(func)) self.assertIsNone(self.cmd_base._pretty_paged(func))
self.cmd_base.verbose = False self.cmd_base.verbose = False
@@ -265,13 +265,13 @@ class CommandsBaseTest(testtools.TestCase):
ret = MockIterable() ret = MockIterable()
func = mock.Mock(return_value=ret) func = mock.Mock(return_value=ret)
self.assertEqual(None, self.cmd_base._pretty_paged(func)) self.assertIsNone(self.cmd_base._pretty_paged(func))
ret.count = 0 ret.count = 0
self.assertEqual(None, self.cmd_base._pretty_paged(func)) self.assertIsNone(self.cmd_base._pretty_paged(func))
func = mock.Mock(side_effect=ValueError) func = mock.Mock(side_effect=ValueError)
self.assertEqual(None, self.cmd_base._pretty_paged(func)) self.assertIsNone(self.cmd_base._pretty_paged(func))
self.cmd_base.debug = True self.cmd_base.debug = True
self.cmd_base.marker = mock.Mock() self.cmd_base.marker = mock.Mock()
self.assertRaises(ValueError, self.cmd_base._pretty_paged, func) self.assertRaises(ValueError, self.cmd_base._pretty_paged, func)
@@ -294,8 +294,8 @@ class AuthTest(testtools.TestCase):
sys.argv = self.orig_sys_argv sys.argv = self.orig_sys_argv
def test___init__(self): def test___init__(self):
self.assertEqual(None, self.auth.dbaas) self.assertIsNone(self.auth.dbaas)
self.assertEqual(None, self.auth.apikey) self.assertIsNone(self.auth.apikey)
def test_login(self): def test_login(self):
self.auth.username = "username" self.auth.username = "username"

5
troveclient/compat/tests/test_xml.py
View File

@@ -65,8 +65,7 @@ class XmlTest(object):
''' '''
rt = etree.fromstring(ele) rt = etree.fromstring(ele)
self.assertEqual(None, self.assertIsNone(xml.populate_element_from_dict(rt, {'size': None}))
xml.populate_element_from_dict(rt, {'size': None}))
def test_element_must_be_list(self): def test_element_must_be_list(self):
# Test for when name isn't in the dictionary # Test for when name isn't in the dictionary
@@ -137,7 +136,7 @@ class XmlTest(object):
</server> </server>
''' '''
rt = etree.fromstring(element) rt = etree.fromstring(element)
self.assertEqual(None, xml.element_to_dict(rt)) self.assertIsNone(xml.element_to_dict(rt))
def test_standarize_json(self): def test_standarize_json(self):
xml.standardize_json_lists(self.JSON) xml.standardize_json_lists(self.JSON)

4
troveclient/tests/test_base.py
View File

@@ -412,7 +412,7 @@ class ResourceTest(testtools.TestCase):
# Resource.HUMAN_ID is False # Resource.HUMAN_ID is False
robj = base.Resource(manager, info_) robj = base.Resource(manager, info_)
self.assertEqual(info_["id"], robj.id) self.assertEqual(info_["id"], robj.id)
self.assertEqual(None, robj.human_id) self.assertIsNone(robj.human_id)
self.assertEqual(2, manager.write_to_completion_cache.call_count) self.assertEqual(2, manager.write_to_completion_cache.call_count)
# base.Resource.HUMAN_ID = True # base.Resource.HUMAN_ID = True
@@ -428,7 +428,7 @@ class ResourceTest(testtools.TestCase):
info_ = {"name": "test-human-id"} info_ = {"name": "test-human-id"}
robj = base.Resource(manager, info_) robj = base.Resource(manager, info_)
self.assertEqual(None, robj.human_id) self.assertIsNone(robj.human_id)
info_["HUMAN_ID"] = True info_["HUMAN_ID"] = True
robj = base.Resource(manager, info_) robj = base.Resource(manager, info_)

2
troveclient/tests/test_instances.py
View File

@@ -138,7 +138,7 @@ class InstancesTest(testtools.TestCase):
self.assertEqual('instance-1', self.instances._action(1, body)) self.assertEqual('instance-1', self.instances._action(1, body))
self.instances.api.client.post = mock.Mock(return_value=(resp, None)) self.instances.api.client.post = mock.Mock(return_value=(resp, None))
self.assertEqual(None, self.instances._action(1, body)) self.assertIsNone(self.instances._action(1, body))
def _set_action_mock(self): def _set_action_mock(self):
def side_effect_func(instance_id, body): def side_effect_func(instance_id, body):