openstack/deb-sahara
Code Issues Proposed changes

Fix order of arguments in assertEqual - Part2

Browse Source 
This part contains changes in tests of plugins.

Some tests used incorrect order assertEqual(observed, expected).
The correct order expected by testtools is:
    def assertEqual(self, expected, observed, message='')

It requires big changes and some tests change frequently.
So I would do it in series of small CR.

Partial-Bug: #1259292

Change-Id: Ie75c6919c60674a4fea7ae95d74c1068e343f026
This commit is contained in:
Jacob Bin Wang 2015-03-18 18:24:47 +08:00
parent 3fda398489
commit 19b25fe29c
8 changed files with 166 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sahara/tests/unit/plugins/general/test_utils.py
View File

@ -42,31 +42,31 @@ class GeneralUtilsTest(testtools.TestCase):
self.ng3 = self.c1.node_groups[2]
def test_get_node_groups(self):
self.assertEqual(u.get_node_groups(self.c1), self.c1.node_groups)
self.assertEqual(u.get_node_groups(self.c1, "wrong-process"), [])
self.assertEqual(u.get_node_groups(self.c1, 'dn'),
[self.ng2, self.ng3])
self.assertEqual(self.c1.node_groups, u.get_node_groups(self.c1))
self.assertEqual([], u.get_node_groups(self.c1, "wrong-process"))
self.assertEqual([self.ng2, self.ng3],
u.get_node_groups(self.c1, 'dn'))
def test_get_instances(self):
self.assertEqual(len(u.get_instances(self.c1)), 5)
self.assertEqual(u.get_instances(self.c1, 'wrong-process'), [])
self.assertEqual(u.get_instances(self.c1, 'nn'),
self.ng1.instances)
self.assertEqual(5, len(u.get_instances(self.c1)))
self.assertEqual([], u.get_instances(self.c1, 'wrong-process'))
self.assertEqual(self.ng1.instances,
u.get_instances(self.c1, 'nn'))
instances = list(self.ng2.instances)
instances += self.ng3.instances
self.assertEqual(u.get_instances(self.c1, 'dn'), instances)
self.assertEqual(instances, u.get_instances(self.c1, 'dn'))
def test_get_instance(self):
self.assertIsNone(u.get_instance(self.c1, 'wrong-process'))
self.assertEqual(u.get_instance(self.c1, 'nn'),
self.ng1.instances[0])
self.assertEqual(self.ng1.instances[0],
u.get_instance(self.c1, 'nn'))
with testtools.ExpectedException(ex.InvalidComponentCountException):
u.get_instance(self.c1, 'dn')
def test_generate_lines_from_list(self):
self.assertEqual(u.generate_host_names(self.ng2.instances),
"worker1\nworker2\nworker3")
self.assertEqual(u.generate_host_names([]), "")
self.assertEqual("worker1\nworker2\nworker3",
u.generate_host_names(self.ng2.instances))
self.assertEqual("", u.generate_host_names([]))
class GetPortUtilsTest(testtools.TestCase):
@ -82,4 +82,4 @@ class GetPortUtilsTest(testtools.TestCase):
def test_get_port_from_address(self):
for address, port in self.test_values:
self.assertEqual(u.get_port_from_address(address), port)
self.assertEqual(port, u.get_port_from_address(address))

81
sahara/tests/unit/plugins/hdp/test_clusterspec.py
View File

@ -275,51 +275,52 @@ class ClusterSpecTest(sahara_base.SaharaTestCase):
# for this value, validating that user inputs override configured
# values, whether they are processed by runtime or not
self.assertEqual(config['core-site']['fs.default.name'],
'hdfs://nn_dif_host.novalocal:8020')
self.assertEqual('hdfs://nn_dif_host.novalocal:8020',
config['core-site']['fs.default.name'])
self.assertEqual(config['mapred-site']['mapred.job.tracker'],
'jt_host.novalocal:50300')
self.assertEqual(config['mapred-site']
['mapred.job.tracker.http.address'],
'jt_host.novalocal:50030')
self.assertEqual(config['mapred-site']
['mapreduce.history.server.http.address'],
'jt_host.novalocal:51111')
self.assertEqual(config['hdfs-site']['dfs.http.address'],
'nn_host.novalocal:50070')
self.assertEqual(config['hdfs-site']['dfs.secondary.http.address'],
'snn_host.novalocal:50090')
self.assertEqual(config['hdfs-site']['dfs.https.address'],
'nn_host.novalocal:50470')
self.assertEqual(config['global']['hive_hostname'],
'hive_host.novalocal')
self.assertEqual(config['core-site']['hadoop.proxyuser.hive.hosts'],
'hive_host.novalocal')
self.assertEqual(config['hive-site']
['javax.jdo.option.ConnectionURL'],
'jdbc:mysql://hive_host.novalocal/hive?'
'createDatabaseIfNotExist=true')
self.assertEqual(config['hive-site']['hive.metastore.uris'],
'thrift://hive_ms_host.novalocal:9083')
self.assertEqual('jt_host.novalocal:50300',
config['mapred-site']['mapred.job.tracker'])
self.assertEqual('jt_host.novalocal:50030',
config['mapred-site']
['mapred.job.tracker.http.address'])
self.assertEqual('jt_host.novalocal:51111',
config['mapred-site']
['mapreduce.history.server.http.address'])
self.assertEqual('nn_host.novalocal:50070',
config['hdfs-site']['dfs.http.address'])
self.assertEqual('snn_host.novalocal:50090',
config['hdfs-site']['dfs.secondary.http.address'])
self.assertEqual('nn_host.novalocal:50470',
config['hdfs-site']['dfs.https.address'])
self.assertEqual('hive_host.novalocal',
config['global']['hive_hostname'])
self.assertEqual('hive_host.novalocal',
config['core-site']['hadoop.proxyuser.hive.hosts'])
self.assertEqual('jdbc:mysql://hive_host.novalocal/hive?'
'createDatabaseIfNotExist=true',
config['hive-site']
['javax.jdo.option.ConnectionURL'])
self.assertEqual('thrift://hive_ms_host.novalocal:9083',
config['hive-site']['hive.metastore.uris'])
self.assertTrue(
'hive.metastore.uris=thrift://hive_ms_host.novalocal:9083' in
config['webhcat-site']['templeton.hive.properties'])
self.assertEqual(config['global']['hive_jdbc_connection_url'],
'jdbc:mysql://hive_mysql_host.novalocal/hive?'
'createDatabaseIfNotExist=true')
self.assertEqual(config['core-site']['hadoop.proxyuser.hcat.hosts'],
'hcat_host.novalocal')
self.assertEqual(set(
config['webhcat-site']['templeton.zookeeper.hosts'].split(',')),
set(['zk1_host.novalocal:2181', 'zk2_host.novalocal:2181']))
self.assertEqual('jdbc:mysql://hive_mysql_host.novalocal/hive?'
'createDatabaseIfNotExist=true',
config['global']['hive_jdbc_connection_url'])
self.assertEqual('hcat_host.novalocal',
config['core-site']['hadoop.proxyuser.hcat.hosts'])
self.assertEqual(
set(['zk1_host.novalocal:2181', 'zk2_host.novalocal:2181']),
set(config['webhcat-site']
['templeton.zookeeper.hosts'].split(',')))
self.assertEqual(config['oozie-site']['oozie.base.url'],
'http://oozie_host.novalocal:11000/oozie')
self.assertEqual(config['global']['oozie_hostname'],
'oozie_host.novalocal')
self.assertEqual(config['core-site']['hadoop.proxyuser.oozie.hosts'],
'oozie_host.novalocal,222.11.9999,111.11.9999')
self.assertEqual('http://oozie_host.novalocal:11000/oozie',
config['oozie-site']['oozie.base.url'])
self.assertEqual('oozie_host.novalocal',
config['global']['oozie_hostname'])
self.assertEqual('oozie_host.novalocal,222.11.9999,111.11.9999',
config['core-site']['hadoop.proxyuser.oozie.hosts'])
# test swift properties
self.assertEqual('swift_prop_value',

174
sahara/tests/unit/plugins/hdp/test_clusterspec_hdp2.py
View File

@ -279,46 +279,47 @@ class ClusterSpecTestForHDP2(sahara_base.SaharaTestCase):
# for this value, validating that user inputs override configured
# values, whether they are processed by runtime or not
self.assertEqual(config['core-site']['fs.defaultFS'],
'hdfs://nn_dif_host.novalocal:8020')
self.assertEqual('hdfs://nn_dif_host.novalocal:8020',
config['core-site']['fs.defaultFS'])
self.assertEqual(config['mapred-site']
['mapreduce.jobhistory.webapp.address'],
'jt_host.novalocal:19888')
self.assertEqual('jt_host.novalocal:19888',
config['mapred-site']
['mapreduce.jobhistory.webapp.address'])
self.assertEqual(config['hdfs-site']['dfs.namenode.http-address'],
'nn_host.novalocal:50070')
self.assertEqual(config['hdfs-site']
['dfs.namenode.secondary.http-address'],
'snn_host.novalocal:50090')
self.assertEqual(config['hdfs-site']['dfs.namenode.https-address'],
'nn_host.novalocal:50470')
self.assertEqual('nn_host.novalocal:50070',
config['hdfs-site']['dfs.namenode.http-address'])
self.assertEqual('snn_host.novalocal:50090',
config['hdfs-site']
['dfs.namenode.secondary.http-address'])
self.assertEqual('nn_host.novalocal:50470',
config['hdfs-site']['dfs.namenode.https-address'])
self.assertEqual(config['global']['hive_hostname'],
'hive_host.novalocal')
self.assertEqual(config['core-site']['hadoop.proxyuser.hive.hosts'],
'hive_host.novalocal')
self.assertEqual(config['hive-site']
['javax.jdo.option.ConnectionURL'],
'jdbc:mysql://hive_mysql_host.novalocal/hive?'
'createDatabaseIfNotExist=true')
self.assertEqual(config['hive-site']['hive.metastore.uris'],
'thrift://hive_ms_host.novalocal:9083')
self.assertEqual('hive_host.novalocal',
config['global']['hive_hostname'])
self.assertEqual('hive_host.novalocal',
config['core-site']['hadoop.proxyuser.hive.hosts'])
self.assertEqual('jdbc:mysql://hive_mysql_host.novalocal/hive?'
'createDatabaseIfNotExist=true',
config['hive-site']
['javax.jdo.option.ConnectionURL'])
self.assertEqual('thrift://hive_ms_host.novalocal:9083',
config['hive-site']['hive.metastore.uris'])
self.assertTrue(
'hive.metastore.uris=thrift://hive_ms_host.novalocal:9083' in
config['webhcat-site']['templeton.hive.properties'])
self.assertEqual(config['core-site']['hadoop.proxyuser.hcat.hosts'],
'hcat_host.novalocal')
self.assertEqual(set(
config['webhcat-site']['templeton.zookeeper.hosts'].split(',')),
set(['zk1_host.novalocal:2181', 'zk2_host.novalocal:2181']))
self.assertEqual('hcat_host.novalocal',
config['core-site']['hadoop.proxyuser.hcat.hosts'])
self.assertEqual(
set(['zk1_host.novalocal:2181', 'zk2_host.novalocal:2181']),
set(config['webhcat-site']
['templeton.zookeeper.hosts'].split(',')))
self.assertEqual(config['oozie-site']['oozie.base.url'],
'http://oozie_host.novalocal:11000/oozie')
self.assertEqual(config['global']['oozie_hostname'],
'oozie_host.novalocal')
self.assertEqual(config['core-site']['hadoop.proxyuser.oozie.hosts'],
'oozie_host.novalocal,222.11.9999,111.11.9999')
self.assertEqual('http://oozie_host.novalocal:11000/oozie',
config['oozie-site']['oozie.base.url'])
self.assertEqual('oozie_host.novalocal',
config['global']['oozie_hostname'])
self.assertEqual('oozie_host.novalocal,222.11.9999,111.11.9999',
config['core-site']['hadoop.proxyuser.oozie.hosts'])
# test swift properties
self.assertEqual('swift_prop_value',
@ -451,67 +452,70 @@ class ClusterSpecTestForHDP2(sahara_base.SaharaTestCase):
# for this value, validating that user inputs override configured
# values, whether they are processed by runtime or not
self.assertEqual(config['core-site']['fs.defaultFS'],
'hdfs://nn_dif_host.novalocal:8020')
self.assertEqual('hdfs://nn_dif_host.novalocal:8020',
config['core-site']['fs.defaultFS'])
self.assertEqual(config['mapred-site']
['mapreduce.jobhistory.webapp.address'],
'jt_host.novalocal:19888')
self.assertEqual('jt_host.novalocal:19888',
config['mapred-site']
['mapreduce.jobhistory.webapp.address'])
self.assertEqual(config['hdfs-site']['dfs.namenode.http-address'],
'nn_host.novalocal:50070')
self.assertEqual(config['hdfs-site']
['dfs.namenode.secondary.http-address'],
'snn_host.novalocal:50090')
self.assertEqual(config['hdfs-site']['dfs.namenode.https-address'],
'nn_host.novalocal:50470')
self.assertEqual(config['hdfs-site']['dfs.support.broken.append'],
'true')
self.assertEqual(config['hdfs-site']['dfs.webhdfs.enabled'],
'true')
self.assertEqual('nn_host.novalocal:50070',
config['hdfs-site']['dfs.namenode.http-address'])
self.assertEqual('snn_host.novalocal:50090',
config['hdfs-site']
['dfs.namenode.secondary.http-address'])
self.assertEqual('nn_host.novalocal:50470',
config['hdfs-site']['dfs.namenode.https-address'])
self.assertEqual('true',
config['hdfs-site']['dfs.support.broken.append'])
self.assertEqual('true',
config['hdfs-site']['dfs.webhdfs.enabled'])
self.assertEqual(config['global']['hive_hostname'],
'hive_host.novalocal')
self.assertEqual(config['core-site']['hadoop.proxyuser.hive.hosts'],
'hive_host.novalocal')
self.assertEqual(config['hive-site']
['javax.jdo.option.ConnectionURL'],
'jdbc:mysql://hive_mysql_host.novalocal/hive?'
'createDatabaseIfNotExist=true')
self.assertEqual(config['hive-site']['hive.metastore.uris'],
'thrift://hive_ms_host.novalocal:9083')
self.assertEqual('hive_host.novalocal',
config['global']['hive_hostname'])
self.assertEqual('hive_host.novalocal',
config['core-site']['hadoop.proxyuser.hive.hosts'])
self.assertEqual('jdbc:mysql://hive_mysql_host.novalocal/hive?'
'createDatabaseIfNotExist=true',
config['hive-site']
['javax.jdo.option.ConnectionURL'])
self.assertEqual('thrift://hive_ms_host.novalocal:9083',
config['hive-site']['hive.metastore.uris'])
self.assertTrue(
'hive.metastore.uris=thrift://hive_ms_host.novalocal:9083' in
config['webhcat-site']['templeton.hive.properties'])
self.assertEqual(config['core-site']['hadoop.proxyuser.hcat.hosts'],
'*')
self.assertEqual(config['core-site']['hadoop.proxyuser.hcat.groups'],
'*')
self.assertEqual(config['core-site']['hadoop.proxyuser.hue.hosts'],
'*')
self.assertEqual(config['core-site']['hadoop.proxyuser.hue.groups'],
'*')
self.assertEqual(set(
config['webhcat-site']['templeton.zookeeper.hosts'].split(',')),
set(['zk1_host.novalocal:2181', 'zk2_host.novalocal:2181']))
self.assertEqual(config['webhcat-site']['webhcat.proxyuser.hue.hosts'],
'*')
self.assertEqual(config['webhcat-site']
['webhcat.proxyuser.hue.groups'],
'*')
self.assertEqual('*',
config['core-site']['hadoop.proxyuser.hcat.hosts'])
self.assertEqual('*',
config['core-site']['hadoop.proxyuser.hcat.groups'])
self.assertEqual('*',
config['core-site']['hadoop.proxyuser.hue.hosts'])
self.assertEqual('*',
config['core-site']['hadoop.proxyuser.hue.groups'])
self.assertEqual(
set(['zk1_host.novalocal:2181', 'zk2_host.novalocal:2181']),
set(config['webhcat-site']
['templeton.zookeeper.hosts'].split(',')))
self.assertEqual('*',
config['webhcat-site']['webhcat.proxyuser.hue.hosts'])
self.assertEqual('*',
config['webhcat-site']
['webhcat.proxyuser.hue.groups'])
self.assertEqual(config['oozie-site']['oozie.base.url'],
'http://oozie_host.novalocal:11000/oozie')
self.assertEqual(config['oozie-site']
self.assertEqual('http://oozie_host.novalocal:11000/oozie',
config['oozie-site']['oozie.base.url'])
self.assertEqual('*',
config['oozie-site']
['oozie.service.ProxyUserService.proxyuser.hue.'
'groups'], '*')
self.assertEqual(config['oozie-site']
'groups'])
self.assertEqual('*',
config['oozie-site']
['oozie.service.ProxyUserService.proxyuser.hue.'
'hosts'], '*')
self.assertEqual(config['global']['oozie_hostname'],
'oozie_host.novalocal')
self.assertEqual(config['core-site']['hadoop.proxyuser.oozie.hosts'],
'oozie_host.novalocal,222.11.9999,111.11.9999')
'hosts'])
self.assertEqual('oozie_host.novalocal',
config['global']['oozie_hostname'])
self.assertEqual('oozie_host.novalocal,222.11.9999,111.11.9999',
config['core-site']['hadoop.proxyuser.oozie.hosts'])
# test swift properties
self.assertEqual('swift_prop_value',

4
sahara/tests/unit/plugins/hdp/test_services.py
View File

@ -211,8 +211,8 @@ class ServicesTest(base.SaharaTestCase):
return_value=[instance_mock])
url_info = {}
url_info = service.register_service_urls(cluster_spec, url_info)
self.assertEqual(url_info['JobFlow']['Oozie'],
'http://127.0.0.1:21000')
self.assertEqual('http://127.0.0.1:21000',
url_info['JobFlow']['Oozie'])
def test_create_ganglia_service(self):
for version in versions:

4
sahara/tests/unit/plugins/vanilla/hadoop2/test_configs.py
View File

@ -30,7 +30,7 @@ class VanillaTwoConfigTestCase(base.SaharaTestCase):
'hadoop_secure_dn_log_dir': '/vol1/hadoop/logs/secure',
'yarn_log_dir': '/vol1/yarn/logs'
}
self.assertEqual(dirs, expected)
self.assertEqual(expected, dirs)
def test_merge_configs(self):
a = {
@ -60,7 +60,7 @@ class VanillaTwoConfigTestCase(base.SaharaTestCase):
'param5': 'value5'
}
}
self.assertEqual(res, expected)
self.assertEqual(expected, res)
class FakeNG(object):

4
sahara/tests/unit/plugins/vanilla/hadoop2/test_utils.py
View File

@ -36,7 +36,7 @@ class UtilsTestCase(base.SaharaTestCase):
'cluster-worker-004.novalocal': 'decommissioned'
}
self.assertEqual(statuses, expected)
self.assertEqual(expected, statuses)
@mock.patch('sahara.plugins.vanilla.utils.get_resourcemanager')
def test_nodemanagers_status(self, rm):
@ -53,7 +53,7 @@ class UtilsTestCase(base.SaharaTestCase):
'cluster-worker-004.novalocal': 'decommissioned'
}
self.assertEqual(statuses, expected)
self.assertEqual(expected, statuses)
def _get_instance(self, out):
inst_remote = mock.MagicMock()

28
sahara/tests/unit/plugins/vanilla/v1_2_1/test_plugin.py
View File

@ -103,12 +103,12 @@ class VanillaPluginTest(base.SaharaWithDbTestCase):
"Wrong-applicable-target": {
't1': 4
}}
self.assertEqual(c_h.extract_environment_confs(env_configs),
['CATALINA_OPTS -Xmx4000m',
self.assertEqual(['CATALINA_OPTS -Xmx4000m',
'HADOOP_DATANODE_OPTS=\\"-Xmx4000m\\"',
'HADOOP_JOBTRACKER_OPTS=\\"-Xmx1000m\\"',
'HADOOP_NAMENODE_OPTS=\\"-Xmx3000m\\"',
'HADOOP_TASKTRACKER_OPTS=\\"-Xmx2000m\\"'])
'HADOOP_TASKTRACKER_OPTS=\\"-Xmx2000m\\"'],
c_h.extract_environment_confs(env_configs))
def test_extract_xml_configs(self):
xml_configs = {
@ -126,11 +126,11 @@ class VanillaPluginTest(base.SaharaWithDbTestCase):
}
}
self.assertEqual(c_h.extract_xml_confs(xml_configs),
[('dfs.replication', 3),
self.assertEqual([('dfs.replication', 3),
('fs.default.name', 'hdfs://'),
('io.sort.factor', 10),
('mapred.reduce.tasks', 2)])
('mapred.reduce.tasks', 2)],
c_h.extract_xml_confs(xml_configs))
def test_general_configs(self):
gen_config = {
@ -157,19 +157,19 @@ class VanillaPluginTest(base.SaharaWithDbTestCase):
}
}
cfg = c_h.generate_cfg_from_general({}, configs, gen_config)
self.assertEqual(cfg, all_configured)
self.assertEqual(all_configured, cfg)
configs['general'].update({'Enable MySQL': False})
cfg = c_h.generate_cfg_from_general({}, configs, gen_config)
self.assertEqual(cfg, {'fs.swift.enabled': True})
self.assertEqual({'fs.swift.enabled': True}, cfg)
configs['general'].update({
'Enable Swift': False,
'Enable MySQL': False
})
cfg = c_h.generate_cfg_from_general({}, configs, gen_config)
self.assertEqual(cfg, {})
self.assertEqual({}, cfg)
configs = {}
cfg = c_h.generate_cfg_from_general({}, configs, gen_config)
self.assertEqual(cfg, all_configured)
self.assertEqual(all_configured, cfg)
def test_get_mysql_configs(self):
cfg = m_h.get_required_mysql_configs(None, None)
@ -186,12 +186,12 @@ class VanillaPluginTest(base.SaharaWithDbTestCase):
cond_get_cluster.return_value = cluster
self.assertEqual(
c_h.get_config_value('HDFS', 'fs.default.name', cluster),
'hdfs://inst1:8020')
'hdfs://inst1:8020',
c_h.get_config_value('HDFS', 'fs.default.name', cluster))
self.assertEqual(
c_h.get_config_value('HDFS', 'spam', cluster), 'eggs')
'eggs', c_h.get_config_value('HDFS', 'spam', cluster))
self.assertEqual(
c_h.get_config_value('HDFS', 'dfs.safemode.extension'), 30000)
30000, c_h.get_config_value('HDFS', 'dfs.safemode.extension'))
self.assertRaises(e.ConfigurationError,
c_h.get_config_value,
'MapReduce', 'spam', cluster)

2
sahara/tests/unit/plugins/vanilla/v1_2_1/test_run_scripts.py
View File

@ -39,4 +39,4 @@ class RunScriptsTest(testtools.TestCase):
def test_check_datanodes_count_expects_zero(self):
remote = mock.Mock()
self.assertTrue(run_scripts.check_datanodes_count(remote, 0))
self.assertEqual(remote.execute_command.call_count, 0)
self.assertEqual(0, remote.execute_command.call_count)