openstack
/
trove
Code Issues Proposed changes

Corrects order of parameters to assertEqual 

The correct order of parameters to assertEqual is (expected,
actual).
It makes the assertion message more meaningful when there is
a failure.

Change-Id: I1ad41bcbec30442785f4cdabb234980e336312d5
Closes-Bug: #1277104
Partial-Bug: #1445131
This commit is contained in:
Sushil Kumar 2015-04-28 13:17:55 +00:00
parent ad008daeba
commit 063de3a18b
19 changed files with 194 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trove/tests/unittests/api/common/test_extensions.py
View File

@ -99,7 +99,7 @@ class TestExtensionLoading(testtools.TestCase):
eps = pkg_resources.EntryPoint.parse_group('mock', EP_TEXT)
mock_iter_eps.return_value = eps.values()
extension_mgr = extensions.ExtensionManager()
self.assertEqual(len(extension_mgr.extensions),
len(DEFAULT_EXTENSION_MAP.keys()),
self.assertEqual(len(DEFAULT_EXTENSION_MAP.keys()),
len(extension_mgr.extensions),
"Loaded invalid extensions")
self._assert_default_extensions(extension_mgr.extensions)

2
trove/tests/unittests/api/common/test_limits.py
View File

@ -219,7 +219,7 @@ class LimitMiddlewareTest(BaseLimitTestSuite):
request = webob.Request.blank("/")
response = request.get_response(self.app)
self.assertEqual(response.status_int, 413)
self.assertEqual(413, response.status_int)
self.assertTrue('Retry-After' in response.headers)
retry_after = int(response.headers['Retry-After'])

2
trove/tests/unittests/backup/test_backup_models.py
View File

@ -335,7 +335,7 @@ class BackupORMTest(testtools.TestCase):
def test_backup_size(self):
db_record = models.DBBackup.find_by(id=self.backup.id)
self.assertEqual(db_record.size, self.backup.size)
self.assertEqual(self.backup.size, db_record.size)
def test_backup_delete(self):
backup = models.DBBackup.find_by(id=self.backup.id)

8
trove/tests/unittests/backup/test_storage.py
View File

@ -144,9 +144,9 @@ class SwiftStorageUtils(testtools.TestCase):
def test_explode_location(self):
location = 'http://mockswift.com/v1/545433/backups/mybackup.tar'
url, container, filename = self.swift._explodeLocation(location)
self.assertEqual(url, 'http://mockswift.com/v1/545433')
self.assertEqual(container, 'backups')
self.assertEqual(filename, 'mybackup.tar')
self.assertEqual('http://mockswift.com/v1/545433', url)
self.assertEqual('backups', container)
self.assertEqual('mybackup.tar', filename)
def test_validate_checksum_good(self):
match = self.swift._verify_checksum('"my-good-etag"', 'my-good-etag')
@ -250,7 +250,7 @@ class StreamReaderTests(testtools.TestCase):
self.assertEqual('XX', results)
self.assertEqual('123_00000000', self.stream.segment,
"The Segment should still be the same")
self.assertEqual(self.stream.segment_length, 100)
self.assertEqual(100, self.stream.segment_length)
checksum = hashlib.md5('XX')
checksum = checksum.hexdigest()
segment_checksum = self.stream.segment_checksum.hexdigest()

4
trove/tests/unittests/cluster/test_cluster_views.py
View File

@ -97,8 +97,8 @@ class ClusterViewTest(TestCase):
instances, ip_list = view._build_instances(
ip_to_be_published_for, instance_dict_to_be_published_for)
self.assertEqual(len(ip_list), number_of_ip_published)
self.assertEqual(len(instances), number_of_instance_dict_published)
self.assertEqual(number_of_ip_published, len(ip_list))
self.assertEqual(number_of_instance_dict_published, len(instances))
test_case([], [], 0, 0)
test_case(['abc'], ['def'], 0, 0)

4
trove/tests/unittests/common/test_exception.py
View File

@ -21,8 +21,8 @@ class TroveErrorTest(TestCase):
def test_valid_error_message_format(self):
error = TroveError("%02d" % 1)
self.assertEqual(error.message, "01")
self.assertEqual("01", error.message)
def test_invalid_error_message_format(self):
error = TroveError("test%999999sdb")
self.assertEqual(error.message, "test999999sdb")
self.assertEqual("test999999sdb", error.message)

6
trove/tests/unittests/datastore/test_datastore_versions.py
View File

@ -21,13 +21,13 @@ class TestDatastoreVersions(TestDatastoreBase):
def test_load_datastore_version(self):
datastore_version = DatastoreVersion.load(self.datastore,
self.ds_version)
self.assertEqual(datastore_version.name, self.ds_version)
self.assertEqual(self.ds_version, datastore_version.name)
def test_datastore_verison_capabilities(self):
self.datastore_version.capabilities.add(self.cap1, enabled=False)
test_filtered_capabilities = self.capability_name_filter(
self.datastore_version.capabilities)
self.assertEqual(len(test_filtered_capabilities), 3,
self.assertEqual(3, len(test_filtered_capabilities),
'Capabilities the test thinks it has are: %s, '
'Filtered capabilities: %s' %
(self.datastore_version.capabilities,
@ -38,7 +38,7 @@ class TestDatastoreVersions(TestDatastoreBase):
self.ds_version)
test_filtered_capabilities = self.capability_name_filter(
self.datastore_version.capabilities)
self.assertEqual(len(test_filtered_capabilities), 3,
self.assertEqual(3, len(test_filtered_capabilities),
'Capabilities the test thinks it has are: %s, '
'Filtered capabilities: %s' %
(self.datastore_version.capabilities,

3
trove/tests/unittests/guestagent/test_couchbase_manager.py
View File

@ -161,8 +161,7 @@ class GuestAgentCouchbaseManagerTest(testtools.TestCase):
rootaccess.write_password_to_file('mypassword')
filepermissions = os.stat(self.tempname).st_mode
self.assertEqual(
filepermissions & 0o777, stat.S_IRUSR)
self.assertEqual(stat.S_IRUSR, filepermissions & 0o777)
@mock.patch.object(utils, 'execute_with_timeout', Mock(return_value=0))
def test_write_password_to_file2(self):

2
trove/tests/unittests/guestagent/test_couchdb_manager.py
View File

@ -151,4 +151,4 @@ class GuestAgentCouchDBManagerTest(testtools.TestCase):
def test_rpc_ping(self):
output = self.manager.rpc_ping(self.context)
self.assertEqual(output, True)
self.assertTrue(output)

4
trove/tests/unittests/guestagent/test_db2_manager.py
View File

@ -119,7 +119,7 @@ class GuestAgentDB2ManagerTest(testtools.TestCase):
overrides=None,
cluster_config=None)
mock_status.begin_install.assert_any_call()
self.assertEqual(mock_app.change_ownership.call_count, 1)
self.assertEqual(1, mock_app.change_ownership.call_count)
if databases:
self.assertTrue(db2_service.DB2Admin.create_database.called)
else:
@ -213,4 +213,4 @@ class GuestAgentDB2ManagerTest(testtools.TestCase):
def test_rpc_ping(self):
output = self.manager.rpc_ping(self.context)
self.assertEqual(output, True)
self.assertTrue(output)

234
trove/tests/unittests/guestagent/test_dbaas.py
View File

@ -155,10 +155,10 @@ class DbaasTest(testtools.TestCase):
options = dbaas.load_mysqld_options()
self.assertEqual(5, len(options))
self.assertEqual(options["user"], ["mysql"])
self.assertEqual(options["port"], ["3306"])
self.assertEqual(options["basedir"], ["/usr"])
self.assertEqual(options["tmpdir"], ["/tmp"])
self.assertEqual(["mysql"], options["user"])
self.assertEqual(["3306"], options["port"])
self.assertEqual(["/usr"], options["basedir"])
self.assertEqual(["/tmp"], options["tmpdir"])
self.assertTrue("skip-external-locking" in options)
def test_load_mysqld_options_contains_plugin_loads_options(self):
@ -171,9 +171,9 @@ class DbaasTest(testtools.TestCase):
options = dbaas.load_mysqld_options()
self.assertEqual(1, len(options))
self.assertEqual(options["plugin-load"],
["blackhole=ha_blackhole.so",
"federated=ha_federated.so"])
self.assertEqual(["blackhole=ha_blackhole.so",
"federated=ha_federated.so"],
options["plugin-load"])
def test_load_mysqld_options_error(self):
@ -259,7 +259,7 @@ class MySqlAdminTest(testtools.TestCase):
expected = ("CREATE DATABASE IF NOT EXISTS "
"`testDB` CHARACTER SET = 'latin2' "
"COLLATE = 'latin2_general_ci';")
self.assertEqual(args[0].text, expected,
self.assertEqual(expected, args[0].text,
"Create database queries are not the same")
self.assertEqual(1, dbaas.LocalSqlClient.execute.call_count,
@ -279,14 +279,14 @@ class MySqlAdminTest(testtools.TestCase):
expected = ("CREATE DATABASE IF NOT EXISTS "
"`testDB` CHARACTER SET = 'latin2' "
"COLLATE = 'latin2_general_ci';")
self.assertEqual(args[0].text, expected,
self.assertEqual(expected, args[0].text,
"Create database queries are not the same")
args, _ = dbaas.LocalSqlClient.execute.call_args_list[1]
expected = ("CREATE DATABASE IF NOT EXISTS "
"`testDB2` CHARACTER SET = 'latin2' "
"COLLATE = 'latin2_general_ci';")
self.assertEqual(args[0].text, expected,
self.assertEqual(expected, args[0].text,
"Create database queries are not the same")
self.assertEqual(2, dbaas.LocalSqlClient.execute.call_count,
@ -312,7 +312,7 @@ class MySqlAdminTest(testtools.TestCase):
args, _ = dbaas.LocalSqlClient.execute.call_args
expected = "DROP DATABASE `testDB`;"
self.assertEqual(args[0].text, expected,
self.assertEqual(expected, args[0].text,
"Delete database queries are not the same")
self.assertTrue(dbaas.LocalSqlClient.execute.called,
@ -329,7 +329,7 @@ class MySqlAdminTest(testtools.TestCase):
if call_args is not None:
args, _ = call_args
expected = "DROP USER `testUser`@`%`;"
self.assertEqual(args[0].text, expected,
self.assertEqual(expected, args[0].text,
"Delete user queries are not the same")
self.assertTrue(dbaas.LocalSqlClient.execute.called,
@ -344,7 +344,7 @@ class MySqlAdminTest(testtools.TestCase):
call_args = dbaas.LocalSqlClient.execute.call_args
if call_args is not None:
args, _ = call_args
self.assertEqual(args[0].text.strip(), expected,
self.assertEqual(expected, args[0].text.strip(),
"Create user queries are not the same")
self.assertEqual(2, dbaas.LocalSqlClient.execute.call_count)
@ -687,8 +687,8 @@ class MySqlAppTest(testtools.TestCase):
self.assertTrue(self.mySqlApp._write_mycnf.called)
self.assertTrue(self.mySqlApp.start_mysql.called)
self.assertEqual(self.appStatus._get_actual_db_status(),
rd_instance.ServiceStatuses.RUNNING)
self.assertEqual(rd_instance.ServiceStatuses.RUNNING,
self.appStatus._get_actual_db_status())
def test_start_db_with_conf_changes_mysql_is_running(self):
@ -716,9 +716,9 @@ class MySqlAppTest(testtools.TestCase):
self.assertRaises(ProcessExecutionError,
self.mySqlApp.reset_configuration,
configuration=configuration)
self.assertEqual(dbaas.utils.execute_with_timeout.call_count, 1)
self.assertEqual(os.unlink.call_count, 1)
self.assertEqual(dbaas.get_auth_password.call_count, 1)
self.assertEqual(1, dbaas.utils.execute_with_timeout.call_count)
self.assertEqual(1, os.unlink.call_count)
self.assertEqual(1, dbaas.get_auth_password.call_count)
def test_mysql_error_in_write_config(self):
configuration = {'config_contents': 'some junk'}
@ -729,8 +729,8 @@ class MySqlAppTest(testtools.TestCase):
self.assertRaises(ProcessExecutionError,
self.mySqlApp.reset_configuration,
configuration=configuration)
self.assertEqual(dbaas.utils.execute_with_timeout.call_count, 1)
self.assertEqual(dbaas.get_auth_password.call_count, 1)
self.assertEqual(1, dbaas.utils.execute_with_timeout.call_count)
self.assertEqual(1, dbaas.get_auth_password.call_count)
class MySqlAppInstallTest(MySqlAppTest):
@ -947,22 +947,22 @@ class InterrogatorTest(testtools.TestCase):
def test_to_gb(self):
result = to_gb(123456789)
self.assertEqual(result, 0.11)
self.assertEqual(0.11, result)
def test_to_gb_zero(self):
result = to_gb(0)
self.assertEqual(result, 0.0)
self.assertEqual(0.0, result)
def test_get_filesystem_volume_stats(self):
with patch.object(os, 'statvfs', return_value=MockStats):
result = get_filesystem_volume_stats('/some/path/')
self.assertEqual(result['block_size'], 4096)
self.assertEqual(result['total_blocks'], 1048576)
self.assertEqual(result['free_blocks'], 524288)
self.assertEqual(result['total'], 4.0)
self.assertEqual(result['free'], 2147483648)
self.assertEqual(result['used'], 2.0)
self.assertEqual(4096, result['block_size'])
self.assertEqual(1048576, result['total_blocks'])
self.assertEqual(524288, result['free_blocks'])
self.assertEqual(4.0, result['total'])
self.assertEqual(2147483648, result['free'])
self.assertEqual(2.0, result['used'])
def test_get_filesystem_volume_stats_error(self):
with patch.object(os, 'statvfs', side_effect=OSError):
@ -986,29 +986,29 @@ class ServiceRegistryTest(testtools.TestCase):
dbaas_sr.get_custom_managers = Mock(return_value=
datastore_registry_ext_test)
test_dict = dbaas_sr.datastore_registry()
self.assertEqual(test_dict.get('test'),
datastore_registry_ext_test.get('test', None))
self.assertEqual(test_dict.get('mysql'),
'trove.guestagent.datastore.mysql.'
'manager.Manager')
self.assertEqual(test_dict.get('percona'),
'trove.guestagent.datastore.mysql.'
'manager.Manager')
self.assertEqual(test_dict.get('redis'),
'trove.guestagent.datastore.experimental.redis.'
'manager.Manager')
self.assertEqual(test_dict.get('cassandra'),
'trove.guestagent.datastore.experimental.cassandra.'
'manager.Manager')
self.assertEqual(test_dict.get('couchbase'),
'trove.guestagent.datastore.experimental.'
'couchbase.manager.Manager')
self.assertEqual(datastore_registry_ext_test.get('test', None),
test_dict.get('test'))
self.assertEqual('trove.guestagent.datastore.mysql.'
'manager.Manager',
test_dict.get('mysql'))
self.assertEqual('trove.guestagent.datastore.mysql.'
'manager.Manager',
test_dict.get('percona'))
self.assertEqual('trove.guestagent.datastore.experimental.redis.'
'manager.Manager',
test_dict.get('redis'))
self.assertEqual('trove.guestagent.datastore.experimental.cassandra.'
'manager.Manager',
test_dict.get('cassandra'))
self.assertEqual('trove.guestagent.datastore.experimental.'
'couchbase.manager.Manager',
test_dict.get('couchbase'))
self.assertEqual('trove.guestagent.datastore.experimental.mongodb.'
'manager.Manager',
test_dict.get('mongodb'))
self.assertEqual(test_dict.get('couchdb'),
'trove.guestagent.datastore.experimental.couchdb.'
'manager.Manager')
self.assertEqual('trove.guestagent.datastore.experimental.couchdb.'
'manager.Manager',
test_dict.get('couchdb'))
self.assertEqual('trove.guestagent.datastore.experimental.db2.'
'manager.Manager',
test_dict.get('db2'))
@ -1021,27 +1021,27 @@ class ServiceRegistryTest(testtools.TestCase):
dbaas_sr.get_custom_managers = Mock(return_value=
datastore_registry_ext_test)
test_dict = dbaas_sr.datastore_registry()
self.assertEqual(test_dict.get('mysql'),
'trove.guestagent.datastore.mysql.'
'manager.Manager123')
self.assertEqual(test_dict.get('percona'),
'trove.guestagent.datastore.mysql.'
'manager.Manager')
self.assertEqual(test_dict.get('redis'),
'trove.guestagent.datastore.experimental.redis.'
'manager.Manager')
self.assertEqual(test_dict.get('cassandra'),
'trove.guestagent.datastore.experimental.cassandra.'
'manager.Manager')
self.assertEqual(test_dict.get('couchbase'),
'trove.guestagent.datastore.experimental.couchbase.'
'manager.Manager')
self.assertEqual('trove.guestagent.datastore.mysql.'
'manager.Manager123',
test_dict.get('mysql'))
self.assertEqual('trove.guestagent.datastore.mysql.'
'manager.Manager',
test_dict.get('percona'))
self.assertEqual('trove.guestagent.datastore.experimental.redis.'
'manager.Manager',
test_dict.get('redis'))
self.assertEqual('trove.guestagent.datastore.experimental.cassandra.'
'manager.Manager',
test_dict.get('cassandra'))
self.assertEqual('trove.guestagent.datastore.experimental.couchbase.'
'manager.Manager',
test_dict.get('couchbase'))
self.assertEqual('trove.guestagent.datastore.experimental.mongodb.'
'manager.Manager',
test_dict.get('mongodb'))
self.assertEqual(test_dict.get('couchdb'),
'trove.guestagent.datastore.experimental.couchdb.'
'manager.Manager')
self.assertEqual('trove.guestagent.datastore.experimental.couchdb.'
'manager.Manager',
test_dict.get('couchdb'))
self.assertEqual('trove.guestagent.datastore.experimental.vertica.'
'manager.Manager',
test_dict.get('vertica'))
@ -1054,27 +1054,27 @@ class ServiceRegistryTest(testtools.TestCase):
dbaas_sr.get_custom_managers = Mock(return_value=
datastore_registry_ext_test)
test_dict = dbaas_sr.datastore_registry()
self.assertEqual(test_dict.get('mysql'),
'trove.guestagent.datastore.mysql.'
'manager.Manager')
self.assertEqual(test_dict.get('percona'),
'trove.guestagent.datastore.mysql.'
'manager.Manager')
self.assertEqual(test_dict.get('redis'),
'trove.guestagent.datastore.experimental.redis.'
'manager.Manager')
self.assertEqual(test_dict.get('cassandra'),
'trove.guestagent.datastore.experimental.cassandra.'
'manager.Manager')
self.assertEqual(test_dict.get('couchbase'),
'trove.guestagent.datastore.experimental.couchbase.'
'manager.Manager')
self.assertEqual('trove.guestagent.datastore.mysql.'
'manager.Manager',
test_dict.get('mysql'))
self.assertEqual('trove.guestagent.datastore.mysql.'
'manager.Manager',
test_dict.get('percona'))
self.assertEqual('trove.guestagent.datastore.experimental.redis.'
'manager.Manager',
test_dict.get('redis'))
self.assertEqual('trove.guestagent.datastore.experimental.cassandra.'
'manager.Manager',
test_dict.get('cassandra'))
self.assertEqual('trove.guestagent.datastore.experimental.couchbase.'
'manager.Manager',
test_dict.get('couchbase'))
self.assertEqual('trove.guestagent.datastore.experimental.mongodb.'
'manager.Manager',
test_dict.get('mongodb'))
self.assertEqual(test_dict.get('couchdb'),
'trove.guestagent.datastore.experimental.couchdb.'
'manager.Manager')
self.assertEqual('trove.guestagent.datastore.experimental.couchdb.'
'manager.Manager',
test_dict.get('couchdb'))
self.assertEqual('trove.guestagent.datastore.experimental.vertica.'
'manager.Manager',
test_dict.get('vertica'))
@ -1156,8 +1156,8 @@ class BaseDbStatusTest(testtools.TestCase):
self.baseDbStatus.begin_install()
self.assertEqual(self.baseDbStatus.status,
rd_instance.ServiceStatuses.BUILDING)
self.assertEqual(rd_instance.ServiceStatuses.BUILDING,
self.baseDbStatus.status)
def test_begin_restart(self):
@ -1332,7 +1332,7 @@ class TestRedisApp(testtools.TestCase):
with patch.object(RedisApp, '_install_redis', return_value=None):
self.app.install_if_needed('bar')
pkg.Package.pkg_is_installed.assert_any_call('bar')
self.assertEqual(RedisApp._install_redis.call_count, 0)
self.assertEqual(0, RedisApp._install_redis.call_count)
def test_install_if_needed_not_installed(self):
with patch.object(pkg.Package, 'pkg_is_installed', return_value=False):
@ -1644,7 +1644,7 @@ class CassandraDBAppTest(testtools.TestCase):
mkstemp_function=mock_mkstemp,
unlink_function=mock_unlink)
self.assertEqual(mock_unlink.call_count, 1)
self.assertEqual(1, mock_unlink.call_count)
# really delete the temporary_config_file
os.unlink(temp_config_name)
@ -2119,19 +2119,19 @@ class VerticaAppTest(testtools.TestCase):
with patch.object(pkg.Package, 'pkg_install', return_value=None):
self.app.install_if_needed('vertica')
pkg.Package.pkg_is_installed.assert_any_call('vertica')
self.assertEqual(pkg.Package.pkg_install.call_count, 0)
self.assertEqual(0, pkg.Package.pkg_install.call_count)
def test_install_if_needed_not_installed(self):
with patch.object(pkg.Package, 'pkg_is_installed', return_value=False):
with patch.object(pkg.Package, 'pkg_install', return_value=None):
self.app.install_if_needed('vertica')
pkg.Package.pkg_is_installed.assert_any_call('vertica')
self.assertEqual(pkg.Package.pkg_install.call_count, 1)
self.assertEqual(1, pkg.Package.pkg_install.call_count)
def test_prepare_for_install_vertica(self):
self.app.prepare_for_install_vertica()
arguments = vertica_system.shell_execute.call_args_list[0]
self.assertEqual(VolumeDevice.set_readahead_size.call_count, 1)
self.assertEqual(1, VolumeDevice.set_readahead_size.call_count)
expected_command = (
"VERT_DBA_USR=dbadmin VERT_DBA_HOME=/home/dbadmin "
"VERT_DBA_GRP=verticadba /opt/vertica/oss/python/bin/python"
@ -2169,7 +2169,7 @@ class VerticaAppTest(testtools.TestCase):
side_effect=RuntimeError('Error')):
self.app.create_db('10.0.0.2')
# Because of an exception in read_config there was no shell execution.
self.assertEqual(vertica_system.shell_execute.call_count, 0)
self.assertEqual(0, vertica_system.shell_execute.call_count)
def test_vertica_write_config(self):
temp_file_handle = tempfile.NamedTemporaryFile(delete=False)
@ -2192,7 +2192,7 @@ class VerticaAppTest(testtools.TestCase):
self.assertEqual(
self.test_config.get('credentials', 'dbadmin_password'),
configuration_data.get('credentials', 'dbadmin_password'))
self.assertEqual(mock_unlink.call_count, 1)
self.assertEqual(1, mock_unlink.call_count)
# delete the temporary_config_file
os.unlink(temp_file_handle.name)
@ -2209,7 +2209,7 @@ class VerticaAppTest(testtools.TestCase):
temp_function=mock_mkstemp,
unlink_function=mock_unlink)
self.assertEqual(mock_unlink.call_count, 1)
self.assertEqual(1, mock_unlink.call_count)
# delete the temporary_config_file
os.unlink(temp_file_handle.name)
@ -2274,8 +2274,8 @@ class VerticaAppTest(testtools.TestCase):
return_value=None)
app.stop_db()
self.assertEqual(vertica_system.shell_execute.call_count,
3)
self.assertEqual(
3, vertica_system.shell_execute.call_count)
# There are 3 shell-executions:
# a) stop vertica-agent service
# b) check daatabase status
@ -2301,8 +2301,8 @@ class VerticaAppTest(testtools.TestCase):
['', '']])):
app.stop_db(do_not_start_on_reboot=True)
self.assertEqual(vertica_system.shell_execute.call_count,
3)
self.assertEqual(
3, vertica_system.shell_execute.call_count)
app._disable_db_on_boot.assert_any_call()
def test_stop_db_database_not_running(self):
@ -2314,8 +2314,8 @@ class VerticaAppTest(testtools.TestCase):
app.stop_db()
# Since database stop command does not gets executed,
# so only 2 shell calls were there.
self.assertEqual(vertica_system.shell_execute.call_count,
2)
self.assertEqual(
2, vertica_system.shell_execute.call_count)
def test_stop_db_failure(self):
mock_status = MagicMock()
@ -2336,7 +2336,7 @@ class VerticaAppTest(testtools.TestCase):
def test_export_conf_to_members(self):
self.app._export_conf_to_members(members=['member1', 'member2'])
self.assertEqual(vertica_system.shell_execute.call_count, 2)
self.assertEqual(2, vertica_system.shell_execute.call_count)
def test_fail__export_conf_to_members(self):
app = VerticaApp(MagicMock())
@ -2352,7 +2352,7 @@ class VerticaAppTest(testtools.TestCase):
with patch.object(os.path, 'expanduser',
return_value=('/home/' + user)):
self.app.authorize_public_keys(user=user, public_keys=keys)
self.assertEqual(vertica_system.shell_execute.call_count, 2)
self.assertEqual(2, vertica_system.shell_execute.call_count)
vertica_system.shell_execute.assert_any_call(
'cat ' + '/home/' + user + '/.ssh/authorized_keys')
@ -2366,7 +2366,7 @@ class VerticaAppTest(testtools.TestCase):
MagicMock(side_effect=[ProcessExecutionError('Some Error'),
['', '']])):
self.app.authorize_public_keys(user=user, public_keys=keys)
self.assertEqual(vertica_system.shell_execute.call_count, 2)
self.assertEqual(2, vertica_system.shell_execute.call_count)
vertica_system.shell_execute.assert_any_call(
'cat ' + '/home/' + user + '/.ssh/authorized_keys')
@ -2388,7 +2388,7 @@ class VerticaAppTest(testtools.TestCase):
with patch.object(os.path, 'expanduser',
return_value=('/home/' + user)):
self.app.get_public_keys(user=user)
self.assertEqual(vertica_system.shell_execute.call_count, 2)
self.assertEqual(2, vertica_system.shell_execute.call_count)
vertica_system.shell_execute.assert_any_call(
(vertica_system.SSH_KEY_GEN % ('/home/' + user)), user)
vertica_system.shell_execute.assert_any_call(
@ -2403,7 +2403,7 @@ class VerticaAppTest(testtools.TestCase):
MagicMock(side_effect=[ProcessExecutionError('Some Error'),
['some_key', None]])):
key = self.app.get_public_keys(user=user)
self.assertEqual(vertica_system.shell_execute.call_count, 2)
self.assertEqual(2, vertica_system.shell_execute.call_count)
self.assertEqual('some_key', key)
def test_fail_get_public_keys(self):
@ -2424,7 +2424,7 @@ class VerticaAppTest(testtools.TestCase):
self.app.install_cluster(members=['member1', 'member2'])
# Verifying nu,ber of shell calls,
# as command has already been tested in preceeding tests
self.assertEqual(vertica_system.shell_execute.call_count, 5)
self.assertEqual(5, vertica_system.shell_execute.call_count)
def test__enable_db_on_boot(self):
app = VerticaApp(MagicMock())
@ -2438,7 +2438,7 @@ class VerticaAppTest(testtools.TestCase):
'sudo', 'su', '-', 'root', '-c',
(vertica_system.VERTICA_AGENT_SERVICE_COMMAND % 'enable')]
self.assertEqual(subprocess.Popen.call_count, 2)
self.assertEqual(2, subprocess.Popen.call_count)
restart_policy.assert_called_with(expected_restart_policy)
agent_enable.assert_called_with(expected_agent_enable)
@ -2459,7 +2459,7 @@ class VerticaAppTest(testtools.TestCase):
expected_agent_disable = (
vertica_system.VERTICA_AGENT_SERVICE_COMMAND % 'disable')
self.assertEqual(vertica_system.shell_execute.call_count, 2)
self.assertEqual(2, vertica_system.shell_execute.call_count)
restart_policy.assert_called_with(expected_restart_policy, 'dbadmin')
agent_disable.assert_called_with(expected_agent_disable, 'root')
@ -2578,7 +2578,7 @@ class DB2AdminTest(testtools.TestCase):
self.assertTrue(db2service.run_command.called)
args, _ = db2service.run_command.call_args_list[0]
expected = "db2 drop database testDB"
self.assertEqual(args[0], expected,
self.assertEqual(expected, args[0],
"Delete database queries are not the same")
def test_list_databases(self):
@ -2590,7 +2590,7 @@ class DB2AdminTest(testtools.TestCase):
expected = "db2 list database directory " \
"| grep -B6 -i indirect | grep 'Database name' | " \
"sed 's/.*= //'"
self.assertEqual(args[0], expected,
self.assertEqual(expected, args[0],
"Delete database queries are not the same")
def test_create_users(self):
@ -2606,9 +2606,9 @@ class DB2AdminTest(testtools.TestCase):
"db2 GRANT DBADM,CREATETAB,BINDADD,CONNECT,DATAACCESS " \
"ON DATABASE TO USER random; db2 connect reset"
self.assertEqual(
args[0], expected,
expected, args[0],
"Granting database access queries are not the same")
self.assertEqual(db2service.run_command.call_count, 1)
self.assertEqual(1, db2service.run_command.call_count)
def test_delete_users_with_db(self):
with patch.object(db2service, 'run_command',
@ -2625,9 +2625,9 @@ class DB2AdminTest(testtools.TestCase):
"db2 REVOKE DBADM,CREATETAB,BINDADD,CONNECT,DATAACCESS " \
"ON DATABASE FROM USER random; db2 connect reset"
self.assertEqual(
args[0], expected,
expected, args[0],
"Revoke database access queries are not the same")
self.assertEqual(db2service.run_command.call_count, 1)
self.assertEqual(1, db2service.run_command.call_count)
def test_delete_users_without_db(self):
FAKE_USER.append(
@ -2648,9 +2648,9 @@ class DB2AdminTest(testtools.TestCase):
"DATAACCESS ON DATABASE FROM USER random2; " \
"db2 connect reset"
self.assertEqual(
args[0], expected,
expected, args[0],
"Revoke database access queries are not the same")
self.assertEqual(db2service.run_command.call_count, 1)
self.assertEqual(1, db2service.run_command.call_count)
def test_list_users(self):
databases = []
@ -2665,7 +2665,7 @@ class DB2AdminTest(testtools.TestCase):
expected = "db2 +o connect to testDB; " \
"db2 -x select grantee, dataaccessauth " \
"from sysibm.sysdbauth; db2 connect reset"
self.assertEqual(args[0], expected,
self.assertEqual(expected, args[0],
"List database queries are not the same")
def test_get_user(self):

2
trove/tests/unittests/guestagent/test_dbmodels.py
View File

@ -30,7 +30,7 @@ class MySQLDatabaseTest(testtools.TestCase):
self.mysqlDb._ignore_dbs = self.origin_ignore_db
def test_name(self):
self.assertEqual(self.mysqlDb.name, None)
self.assertIsNone(self.mysqlDb.name)
def test_name_setter(self):
test_name = "Anna"

26
trove/tests/unittests/guestagent/test_mysql_manager.py
View File

@ -230,14 +230,14 @@ class GuestAgentManagerTest(testtools.TestCase):
# verification/assertion
mock_status.begin_install.assert_any_call()
self.assertEqual(VolumeDevice.format.call_count, COUNT)
self.assertEqual(VolumeDevice.migrate_data.call_count, COUNT)
self.assertEqual(VolumeDevice.mount_points.call_count, COUNT)
self.assertEqual(dbaas.MySqlApp.stop_db.call_count, COUNT)
self.assertEqual(COUNT, VolumeDevice.format.call_count)
self.assertEqual(COUNT, VolumeDevice.migrate_data.call_count)
self.assertEqual(COUNT, VolumeDevice.mount_points.call_count)
self.assertEqual(COUNT, dbaas.MySqlApp.stop_db.call_count)
if is_mounted:
self.assertEqual(VolumeDevice.unmount.call_count, 1)
self.assertEqual(1, VolumeDevice.unmount.call_count)
else:
self.assertEqual(VolumeDevice.unmount.call_count, 0)
self.assertEqual(0, VolumeDevice.unmount.call_count)
if backup_info:
backup.restore.assert_any_call(self.context,
backup_info,
@ -290,10 +290,10 @@ class GuestAgentManagerTest(testtools.TestCase):
replica_source_config))
# assertions
self.assertEqual(expected_replication_snapshot, replication_snapshot)
self.assertEqual(mock_replication.enable_as_master.call_count, 1)
self.assertEqual(1, mock_replication.enable_as_master.call_count)
self.assertEqual(
mock_replication.snapshot_for_replication.call_count, 1)
self.assertEqual(mock_replication.get_master_ref.call_count, 1)
1, mock_replication.snapshot_for_replication.call_count)
self.assertEqual(1, mock_replication.get_master_ref.call_count)
def test_attach_replication_slave_valid(self):
mock_status = MagicMock()
@ -313,7 +313,7 @@ class GuestAgentManagerTest(testtools.TestCase):
# entry point
self.manager.attach_replica(self.context, snapshot, None)
# assertions
self.assertEqual(mock_replication.enable_as_slave.call_count, 1)
self.assertEqual(1, mock_replication.enable_as_slave.call_count)
def test_attach_replication_slave_invalid(self):
mock_status = MagicMock()
@ -335,7 +335,7 @@ class GuestAgentManagerTest(testtools.TestCase):
self.manager.attach_replica,
self.context, snapshot, None)
# assertions
self.assertEqual(mock_replication.enable_as_slave.call_count, 0)
self.assertEqual(0, mock_replication.enable_as_slave.call_count)
def test_detach_replica(self):
mock_status = MagicMock()
@ -348,7 +348,7 @@ class GuestAgentManagerTest(testtools.TestCase):
# entry point
self.manager.detach_replica(self.context)
# assertions
self.assertEqual(mock_replication.detach_slave.call_count, 1)
self.assertEqual(1, mock_replication.detach_slave.call_count)
def test_demote_replication_master(self):
mock_status = MagicMock()
@ -361,7 +361,7 @@ class GuestAgentManagerTest(testtools.TestCase):
# entry point
self.manager.demote_replication_master(self.context)
# assertions
self.assertEqual(mock_replication.demote_master.call_count, 1)
self.assertEqual(1, mock_replication.demote_master.call_count)
def test_get_master_UUID(self):
app = dbaas.MySqlApp(None)

16
trove/tests/unittests/guestagent/test_vertica_manager.py
View File

@ -111,15 +111,15 @@ class GuestAgentManagerTest(testtools.TestCase):
cluster_config=None,
path_exists_function=path_exists_function)
self.assertEqual(VolumeDevice.format.call_count, expected_vol_count)
self.assertEqual(VolumeDevice.migrate_data.call_count,
expected_vol_count)
self.assertEqual(VolumeDevice.mount_points.call_count,
expected_vol_count)
self.assertEqual(expected_vol_count, VolumeDevice.format.call_count)
self.assertEqual(expected_vol_count,
VolumeDevice.migrate_data.call_count)
self.assertEqual(expected_vol_count,
VolumeDevice.mount_points.call_count)
if is_mounted:
self.assertEqual(VolumeDevice.unmount.call_count, 1)
self.assertEqual(1, VolumeDevice.unmount.call_count)
else:
self.assertEqual(VolumeDevice.unmount.call_count, 0)
self.assertEqual(0, VolumeDevice.unmount.call_count)
VerticaApp.install_if_needed.assert_any_call(packages)
VerticaApp.prepare_for_install_vertica.assert_any_call()
@ -205,7 +205,7 @@ class GuestAgentManagerTest(testtools.TestCase):
def test_rpc_ping(self):
output = self.manager.rpc_ping(self.context)
self.assertEqual(output, True)
self.assertTrue(output)
@patch.object(VerticaAppStatus, 'set_status')
def test_prepare_invalid_cluster_config(self, mock_set_status):

22
trove/tests/unittests/instance/test_instance_controller.py
View File

@ -142,7 +142,7 @@ class TestInstanceController(TestCase):
validator = jsonschema.Draft4Validator(schema)
self.assertFalse(validator.is_valid(body))
errors = sorted(validator.iter_errors(body), key=lambda e: e.path)
self.assertEqual(len(errors), 1)
self.assertEqual(1, len(errors))
self.assertIn("'$#$%^^' does not match '^.*[0-9a-zA-Z]+.*$'",
errors[0].message)
@ -249,10 +249,10 @@ class TestInstanceController(TestCase):
self.controller._modify_instance(instance, **args)
self.assertEqual(instance.detach_replica.call_count, 0)
self.assertEqual(instance.unassign_configuration.call_count, 0)
self.assertEqual(instance.assign_configuration.call_count, 0)
self.assertEqual(instance.update_db.call_count, 0)
self.assertEqual(0, instance.detach_replica.call_count)
self.assertEqual(0, instance.unassign_configuration.call_count)
self.assertEqual(0, instance.assign_configuration.call_count)
self.assertEqual(0, instance.update_db.call_count)
def test_modify_instance_with_nonempty_args_calls_update_db(self):
instance = self._setup_modify_instance_mocks()
@ -270,7 +270,7 @@ class TestInstanceController(TestCase):
self.controller._modify_instance(instance, **args)
self.assertEqual(instance.detach_replica.call_count, 0)
self.assertEqual(0, instance.detach_replica.call_count)
def test_modify_instance_with_True_detach_replica_arg(self):
instance = self._setup_modify_instance_mocks()
@ -279,7 +279,7 @@ class TestInstanceController(TestCase):
self.controller._modify_instance(instance, **args)
self.assertEqual(instance.detach_replica.call_count, 1)
self.assertEqual(1, instance.detach_replica.call_count)
def test_modify_instance_with_configuration_id_arg(self):
instance = self._setup_modify_instance_mocks()
@ -288,7 +288,7 @@ class TestInstanceController(TestCase):
self.controller._modify_instance(instance, **args)
self.assertEqual(instance.assign_configuration.call_count, 1)
self.assertEqual(1, instance.assign_configuration.call_count)
def test_modify_instance_with_None_configuration_id_arg(self):
instance = self._setup_modify_instance_mocks()
@ -297,7 +297,7 @@ class TestInstanceController(TestCase):
self.controller._modify_instance(instance, **args)
self.assertEqual(instance.unassign_configuration.call_count, 1)
self.assertEqual(1, instance.unassign_configuration.call_count)
def test_modify_instance_with_all_args(self):
instance = self._setup_modify_instance_mocks()
@ -307,6 +307,6 @@ class TestInstanceController(TestCase):
self.controller._modify_instance(instance, **args)
self.assertEqual(instance.detach_replica.call_count, 1)
self.assertEqual(instance.assign_configuration.call_count, 1)
self.assertEqual(1, instance.detach_replica.call_count)
self.assertEqual(1, instance.assign_configuration.call_count)
instance.update_db.assert_called_once_with(**args)

4
trove/tests/unittests/mgmt/test_models.py
View File

@ -415,7 +415,7 @@ class TestMgmtInstanceDeleted(MockMgmtInstanceTest):
instance = DBInstance.find_by(context=self.context,
id=active_instance.id)
self.assertEqual(instance.id, active_instance.id)
self.assertEqual(active_instance.id, instance.id)
self.assertRaises(
exception.ModelNotFoundError,
@ -427,7 +427,7 @@ class TestMgmtInstanceDeleted(MockMgmtInstanceTest):
instance = DBInstance.find_by(context=self.context,
id=deleted_instance.id,
deleted=True)
self.assertEqual(instance.id, deleted_instance.id)
self.assertEqual(deleted_instance.id, instance.id)
class TestMgmtInstancePing(MockMgmtInstanceTest):

8
trove/tests/unittests/quota/test_quota.py
View File

@ -105,7 +105,7 @@ class QuotaControllerTest(testtools.TestCase):
body = {'quotas': {'instances': None}}
result = self.controller.update(self.req, body, FAKE_TENANT1,
FAKE_TENANT2)
self.assertEqual(quota.save.call_count, 0)
self.assertEqual(0, quota.save.call_count)
self.assertEqual(200, result.status)
def test_update_resource_instance(self):
@ -115,7 +115,7 @@ class QuotaControllerTest(testtools.TestCase):
body = {'quotas': {'instances': 2}}
result = self.controller.update(self.req, body, FAKE_TENANT1,
FAKE_TENANT2)
self.assertEqual(instance_quota.save.call_count, 1)
self.assertEqual(1, instance_quota.save.call_count)
self.assertTrue('instances' in result._data['quotas'])
self.assertEqual(200, result.status)
self.assertEqual(2, result._data['quotas']['instances'])
@ -135,9 +135,9 @@ class QuotaControllerTest(testtools.TestCase):
body = {'quotas': {'instances': None, 'volumes': 10}}
result = self.controller.update(self.req, body, FAKE_TENANT1,
FAKE_TENANT2)
self.assertEqual(instance_quota.save.call_count, 0)
self.assertEqual(0, instance_quota.save.call_count)
self.assertFalse('instances' in result._data['quotas'])
self.assertEqual(volume_quota.save.call_count, 1)
self.assertEqual(1, volume_quota.save.call_count)
self.assertEqual(200, result.status)
self.assertEqual(10, result._data['quotas']['volumes'])

34
trove/tests/unittests/taskmanager/test_models.py
View File

@ -242,8 +242,8 @@ class FreshInstanceTasksTest(testtools.TestCase):
self.assertTrue(
'/etc/trove/conf.d/trove-guestagent.conf' in files)
self.assertEqual(
files['/etc/trove/conf.d/trove-guestagent.conf'],
self.guestconfig_content)
self.guestconfig_content,
files['/etc/trove/conf.d/trove-guestagent.conf'])
@patch('trove.taskmanager.models.CONF')
def test_create_instance_guestconfig_compat(self, mock_conf):
@ -266,8 +266,8 @@ class FreshInstanceTasksTest(testtools.TestCase):
self.assertTrue(
'/etc/trove-guestagent.conf' in files)
self.assertEqual(
files['/etc/trove-guestagent.conf'],
self.guestconfig_content)
self.guestconfig_content,
files['/etc/trove-guestagent.conf'])
@patch('trove.taskmanager.models.CONF')
def test_create_instance_with_az_kwarg(self, mock_conf):
@ -304,10 +304,10 @@ class FreshInstanceTasksTest(testtools.TestCase):
DBInstance.find_by = Mock(
return_value=fake_DBInstance.find_by())
self.freshinstancetasks.update_statuses_on_time_out()
self.assertEqual(fake_InstanceServiceStatus.find_by().get_status(),
ServiceStatuses.FAILED_TIMEOUT_GUESTAGENT)
self.assertEqual(fake_DBInstance.find_by().get_task_status(),
InstanceTasks.BUILDING_ERROR_TIMEOUT_GA)
self.assertEqual(ServiceStatuses.FAILED_TIMEOUT_GUESTAGENT,
fake_InstanceServiceStatus.find_by().get_status())
self.assertEqual(InstanceTasks.BUILDING_ERROR_TIMEOUT_GA,
fake_DBInstance.find_by().get_task_status())
def test_create_sg_rules_success(self):
datastore_manager = 'mysql'
@ -595,7 +595,7 @@ class BuiltInstanceTasksTest(testtools.TestCase):
do_not_start_on_reboot=True)
orig_server.resize.assert_any_call(self.new_flavor['id'])
self.assertThat(self.db_instance.task_status, Is(InstanceTasks.NONE))
self.assertEqual(self.stub_server_mgr.get.call_count, 1)
self.assertEqual(1, self.stub_server_mgr.get.call_count)
self.assertThat(self.db_instance.flavor_id, Is(self.new_flavor['id']))
def test_resize_flavor_resize_failure(self):
@ -715,26 +715,26 @@ class BackupTasksTest(testtools.TestCase):
def test_parse_manifest(self):
manifest = 'container/prefix'
cont, prefix = taskmanager_models.BackupTasks._parse_manifest(manifest)
self.assertEqual(cont, 'container')
self.assertEqual(prefix, 'prefix')
self.assertEqual('container', cont)
self.assertEqual('prefix', prefix)
def test_parse_manifest_bad(self):
manifest = 'bad_prefix'
cont, prefix = taskmanager_models.BackupTasks._parse_manifest(manifest)
self.assertEqual(cont, None)
self.assertEqual(prefix, None)
self.assertIsNone(cont)
self.assertIsNone(prefix)
def test_parse_manifest_long(self):
manifest = 'container/long/path/to/prefix'
cont, prefix = taskmanager_models.BackupTasks._parse_manifest(manifest)
self.assertEqual(cont, 'container')
self.assertEqual(prefix, 'long/path/to/prefix')
self.assertEqual('container', cont)
self.assertEqual('long/path/to/prefix', prefix)
def test_parse_manifest_short(self):
manifest = 'container/'
cont, prefix = taskmanager_models.BackupTasks._parse_manifest(manifest)
self.assertEqual(cont, 'container')
self.assertEqual(prefix, '')
self.assertEqual('container', cont)
self.assertEqual('', prefix)
class NotifyMixinTest(testtools.TestCase):

4
trove/tests/unittests/taskmanager/test_vertica_clusters.py
View File

@ -90,7 +90,7 @@ class VerticaClusterTasksTest(testtools.TestCase):
ret_val = self.clustertasks._all_instances_ready(["1", "2", "3", "4"],
self.cluster_id)
mock_update.assert_called_with(self.cluster_id, None)
self.assertEqual(False, ret_val)
self.assertFalse(ret_val)
@patch.object(InstanceServiceStatus, 'find_by')
def test_all_instances_ready(self, mock_find):
@ -98,7 +98,7 @@ class VerticaClusterTasksTest(testtools.TestCase):
get_status.return_value) = ServiceStatuses.RUNNING
ret_val = self.clustertasks._all_instances_ready(["1", "2", "3", "4"],
self.cluster_id)
self.assertEqual(True, ret_val)
self.assertTrue(ret_val)
@patch.object(ClusterTasks, 'reset_task')
@patch.object(ClusterTasks, 'get_guest')