openstack/python-cinderclient
Code Issues Proposed changes

Modify assertTrue

Browse Source 
For example: assertTrue(v1<v2) is equal to assertLess(v1,v2)

Change-Id: Ic4a0e80eab167079631ac7dc054ad4d2a8a02fab
This commit is contained in:
zheng yin
2016-07-26 19:57:01 +08:00
committed by ChangBo Guo(gcb)
parent ce2c1daee5
commit 6cc2360a5c
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cinderclient/tests/functional/test_readonly_cli.py
View File

@@ -52,7 +52,7 @@ class CinderClientReadOnlyTests(base.ClientTestBase):
tables = self.parser.tables(out) tables = self.parser.tables(out)
for table in tables: for table in tables:
headers = table['headers'] headers = table['headers']
self.assertTrue(2 >= len(headers)) self.assertGreaterEqual(2, len(headers))
self.assertEqual('Value', headers[1]) self.assertEqual('Value', headers[1])
def test_extra_specs_list(self): def test_extra_specs_list(self):

12
cinderclient/tests/unit/test_api_versions.py
View File

@@ -59,12 +59,12 @@ class APIVersionTestCase(utils.TestCase):
v4 = api_versions.APIVersion("2.0") v4 = api_versions.APIVersion("2.0")
v_null = api_versions.APIVersion() v_null = api_versions.APIVersion()
self.assertTrue(v1 < v2) self.assertLess(v1, v2)
self.assertTrue(v3 > v2) self.assertGreater(v3, v2)
self.assertTrue(v1 != v2) self.assertNotEqual(v1, v2)
self.assertTrue(v1 == v4) self.assertEqual(v1, v4)
self.assertTrue(v1 != v_null) self.assertNotEqual(v1, v_null)
self.assertTrue(v_null == v_null) self.assertEqual(v_null, v_null)
self.assertRaises(TypeError, v1.__le__, "2.1") self.assertRaises(TypeError, v1.__le__, "2.1")
def test_version_matches(self): def test_version_matches(self):

4
cinderclient/tests/unit/v1/contrib/test_list_extensions.py
View File

@@ -29,6 +29,6 @@ class ListExtensionsTests(utils.TestCase):
def test_list_extensions(self): def test_list_extensions(self):
all_exts = cs.list_extensions.show_all() all_exts = cs.list_extensions.show_all()
cs.assert_called('GET', '/extensions') cs.assert_called('GET', '/extensions')
self.assertTrue(len(all_exts) > 0) self.assertGreater(len(all_exts), 0)
for r in all_exts: for r in all_exts:
self.assertTrue(len(r.summary) > 0) self.assertGreater(len(r.summary), 0)

4
cinderclient/tests/unit/v2/contrib/test_list_extensions.py
View File

@@ -31,6 +31,6 @@ class ListExtensionsTests(utils.TestCase):
def test_list_extensions(self): def test_list_extensions(self):
all_exts = cs.list_extensions.show_all() all_exts = cs.list_extensions.show_all()
cs.assert_called('GET', '/extensions') cs.assert_called('GET', '/extensions')
self.assertTrue(len(all_exts) > 0) self.assertGreater(len(all_exts), 0)
for r in all_exts: for r in all_exts:
self.assertTrue(len(r.summary) > 0) self.assertGreater(len(r.summary), 0)