openstack/validations-libs
Code Issues Proposed changes

Deprecated assertEquals replaced

Browse Source 
This should help cleanup the logs somewhat.

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: Ib98e6e227753c7b2831b85962acafab9f83a0b12
This commit is contained in:
Jiri Podivin 2021-05-31 11:17:31 +02:00
parent 0f00fd79f9
commit c00f96acab
6 changed files with 109 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
validations_libs/tests/cli/test_colors.py
View File

@ -50,19 +50,19 @@ class TestColors(TestCase):
color = self.status_color[status] color = self.status_color[status]
colored_output = colors.color_output("fizz", status=status) colored_output = colors.color_output("fizz", status=status)
#Checking reset color #Checking reset color
self.assertEquals(colored_output[-6:], '\033[0;0m') self.assertEqual(colored_output[-6:], '\033[0;0m')
#Checking output color #Checking output color
self.assertEquals(colored_output[:len(color)], color) self.assertEqual(colored_output[:len(color)], color)
#Checking output string #Checking output string
self.assertEquals(colored_output[len(color):][:4], "fizz") self.assertEqual(colored_output[len(color):][:4], "fizz")
def test_format_unknown_status(self): def test_format_unknown_status(self):
color = self.status_color['UNKNOWN'] color = self.status_color['UNKNOWN']
colored_output = colors.color_output("buzz") colored_output = colors.color_output("buzz")
#Checking reset color #Checking reset color
self.assertEquals(colored_output[-6:], '\033[0;0m') self.assertEqual(colored_output[-6:], '\033[0;0m')
#Checking output color #Checking output color
self.assertEquals(colored_output[:len(color)], color) self.assertEqual(colored_output[:len(color)], color)
#Checking output string #Checking output string
self.assertEquals(colored_output[len(color):][:4], "buzz") self.assertEqual(colored_output[len(color):][:4], "buzz")

10
validations_libs/tests/test_ansible.py
View File

@ -216,7 +216,7 @@ class TestAnsible(TestCase):
_playbook, _rc, _status = self.run.run('existing.yaml', _playbook, _rc, _status = self.run.run('existing.yaml',
'localhost,', 'localhost,',
'/tmp') '/tmp')
self.assertEquals((_playbook, _rc, _status), self.assertEqual((_playbook, _rc, _status),
('existing.yaml', 1, 'failed')) ('existing.yaml', 1, 'failed'))
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -235,7 +235,7 @@ class TestAnsible(TestCase):
inventory='localhost,', inventory='localhost,',
workdir='/tmp' workdir='/tmp'
) )
self.assertEquals((_playbook, _rc, _status), self.assertEqual((_playbook, _rc, _status),
('existing.yaml', 0, 'successful')) ('existing.yaml', 0, 'successful'))
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -257,7 +257,7 @@ class TestAnsible(TestCase):
connection='local', connection='local',
gathering_policy='smart' gathering_policy='smart'
) )
self.assertEquals((_playbook, _rc, _status), self.assertEqual((_playbook, _rc, _status),
('existing.yaml', 0, 'successful')) ('existing.yaml', 0, 'successful'))
@mock.patch('os.path.exists', return_value=True) @mock.patch('os.path.exists', return_value=True)
@ -278,7 +278,7 @@ class TestAnsible(TestCase):
workdir='/tmp', workdir='/tmp',
connection='local' connection='local'
) )
self.assertEquals((_playbook, _rc, _status), self.assertEqual((_playbook, _rc, _status),
('existing.yaml', 0, 'successful')) ('existing.yaml', 0, 'successful'))
@mock.patch('os.path.exists', return_value=True) @mock.patch('os.path.exists', return_value=True)
@ -300,7 +300,7 @@ class TestAnsible(TestCase):
connection='local', connection='local',
run_async=True run_async=True
) )
self.assertEquals((_playbook, _rc, _status), self.assertEqual((_playbook, _rc, _status),
('existing.yaml', None, 'unstarted')) ('existing.yaml', None, 'unstarted'))
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')

6
validations_libs/tests/test_group.py
View File

@ -33,7 +33,7 @@ class TestGroup(TestCase):
def test_get_data(self, mock_open, mock_yaml): def test_get_data(self, mock_open, mock_yaml):
grp = Group('/tmp/foo') grp = Group('/tmp/foo')
data = grp.get_data data = grp.get_data
self.assertEquals(data, fakes.GROUP) self.assertEqual(data, fakes.GROUP)
@mock.patch('yaml.safe_load', return_value=fakes.GROUP) @mock.patch('yaml.safe_load', return_value=fakes.GROUP)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -41,7 +41,7 @@ class TestGroup(TestCase):
grp = Group('/tmp/foo') grp = Group('/tmp/foo')
ret = [('no-op', 'noop-foo'), ('post', 'post-foo'), ('pre', 'pre-foo')] ret = [('no-op', 'noop-foo'), ('post', 'post-foo'), ('pre', 'pre-foo')]
data = grp.get_formated_group data = grp.get_formated_group
self.assertEquals(data, ret) self.assertEqual(data, ret)
@mock.patch('yaml.safe_load', return_value=fakes.GROUP) @mock.patch('yaml.safe_load', return_value=fakes.GROUP)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -49,7 +49,7 @@ class TestGroup(TestCase):
grp = Group('/tmp/foo') grp = Group('/tmp/foo')
ret = ['no-op', 'post', 'pre'] ret = ['no-op', 'post', 'pre']
data = grp.get_groups_keys_list data = grp.get_groups_keys_list
self.assertEquals(data, ret) self.assertEqual(data, ret)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_group_file_not_found(self, mock_open): def test_group_file_not_found(self, mock_open):

20
validations_libs/tests/test_validation.py
View File

@ -33,14 +33,14 @@ class TestValidation(TestCase):
def test_get_data(self, mock_open, mock_yaml): def test_get_data(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
data = val.get_data data = val.get_data
self.assertEquals(data, fakes.FAKE_PLAYBOOK[0]) self.assertEqual(data, fakes.FAKE_PLAYBOOK[0])
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_get_metadata(self, mock_open, mock_yaml): def test_get_metadata(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
data = val.get_metadata data = val.get_metadata
self.assertEquals(data, fakes.FAKE_METADATA) self.assertEqual(data, fakes.FAKE_METADATA)
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -55,14 +55,14 @@ class TestValidation(TestCase):
def test_get_vars(self, mock_open, mock_yaml): def test_get_vars(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
data = val.get_vars data = val.get_vars
self.assertEquals(data, fakes.FAKE_VARS) self.assertEqual(data, fakes.FAKE_VARS)
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_get_vars_no_vars(self, mock_open, mock_yaml): def test_get_vars_no_vars(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
data = val.get_vars data = val.get_vars
self.assertEquals(data, {}) self.assertEqual(data, {})
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -78,15 +78,15 @@ class TestValidation(TestCase):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
id = val.id id = val.id
get_id = val.get_id get_id = val.get_id
self.assertEquals(id, 'foo') self.assertEqual(id, 'foo')
self.assertEquals(get_id, 'foo') self.assertEqual(get_id, 'foo')
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_groups(self, mock_open, mock_yaml): def test_groups(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
groups = val.groups groups = val.groups
self.assertEquals(groups, ['prep', 'pre-deployment']) self.assertEqual(groups, ['prep', 'pre-deployment'])
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -101,21 +101,21 @@ class TestValidation(TestCase):
def test_groups_with_no_existing_groups(self, mock_open, mock_yaml): def test_groups_with_no_existing_groups(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
groups = val.groups groups = val.groups
self.assertEquals(groups, []) self.assertEqual(groups, [])
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_get_ordered_dict(self, mock_open, mock_yaml): def test_get_ordered_dict(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
data = val.get_ordered_dict data = val.get_ordered_dict
self.assertEquals(data, fakes.FAKE_PLAYBOOK[0]) self.assertEqual(data, fakes.FAKE_PLAYBOOK[0])
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_get_formated_data(self, mock_open, mock_yaml): def test_get_formated_data(self, mock_open, mock_yaml):
val = Validation('/tmp/foo') val = Validation('/tmp/foo')
data = val.get_formated_data data = val.get_formated_data
self.assertEquals(data, fakes.FORMATED_DATA) self.assertEqual(data, fakes.FORMATED_DATA)
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')

61
validations_libs/tests/test_validation_log.py
View File

@ -33,9 +33,9 @@ class TestValidationLog(TestCase):
def test_validation_log_file(self, mock_open, mock_json): def test_validation_log_file(self, mock_open, mock_json):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
self.assertEquals(val.uuid, '123') self.assertEqual(val.uuid, '123')
self.assertEquals(val.validation_id, 'foo') self.assertEqual(val.validation_id, 'foo')
self.assertEquals(val.datetime, '2020-03-30T13:17:22.447857Z') self.assertEqual(val.datetime, '2020-03-30T13:17:22.447857Z')
@mock.patch('json.load') @mock.patch('json.load')
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -60,9 +60,9 @@ class TestValidationLog(TestCase):
def test_validation_underscore_validation_id(self, mock_open, mock_json): def test_validation_underscore_validation_id(self, mock_open, mock_json):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_bar_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_bar_2020-03-30T13:17:22.447857Z.json')
self.assertEquals(val.uuid, '123') self.assertEqual(val.uuid, '123')
self.assertEquals(val.validation_id, 'foo_bar') self.assertEqual(val.validation_id, 'foo_bar')
self.assertEquals(val.datetime, '2020-03-30T13:17:22.447857Z') self.assertEqual(val.datetime, '2020-03-30T13:17:22.447857Z')
@mock.patch('json.load') @mock.patch('json.load')
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -83,7 +83,7 @@ class TestValidationLog(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
val = ValidationLog(uuid='123', validation_id='foo', log_path='/tmp') val = ValidationLog(uuid='123', validation_id='foo', log_path='/tmp')
path = val.get_log_path() path = val.get_log_path()
self.assertEquals(path, self.assertEqual(path,
'/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') '/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
@mock.patch('glob.glob') @mock.patch('glob.glob')
@ -94,7 +94,7 @@ class TestValidationLog(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
val = ValidationLog(uuid='123', validation_id='foo', log_path='/tmp') val = ValidationLog(uuid='123', validation_id='foo', log_path='/tmp')
log_info = val.get_logfile_infos log_info = val.get_logfile_infos
self.assertEquals(log_info, self.assertEqual(log_info,
['123', 'foo', '2020-03-30T13:17:22.447857Z']) ['123', 'foo', '2020-03-30T13:17:22.447857Z'])
@mock.patch('glob.glob') @mock.patch('glob.glob')
@ -105,7 +105,7 @@ class TestValidationLog(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
val = ValidationLog(uuid='123', validation_id='foo', log_path='/tmp') val = ValidationLog(uuid='123', validation_id='foo', log_path='/tmp')
datetime = val.get_logfile_datetime datetime = val.get_logfile_datetime
self.assertEquals(datetime, '2020-03-30T13:17:22.447857Z') self.assertEqual(datetime, '2020-03-30T13:17:22.447857Z')
@mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST) @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
@ -113,7 +113,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
content = val.get_logfile_content content = val.get_logfile_content
self.assertEquals(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST) self.assertEqual(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -122,8 +122,8 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
uuid = val.get_uuid uuid = val.get_uuid
self.assertEquals(uuid, '123') self.assertEqual(uuid, '123')
self.assertEquals(val.uuid, '123') self.assertEqual(val.uuid, '123')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -132,8 +132,8 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
validation_id = val.get_validation_id validation_id = val.get_validation_id
self.assertEquals(validation_id, 'foo') self.assertEqual(validation_id, 'foo')
self.assertEquals(val.validation_id, 'foo') self.assertEqual(val.validation_id, 'foo')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -142,7 +142,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
status = val.get_status status = val.get_status
self.assertEquals(status, 'PASSED') self.assertEqual(status, 'PASSED')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.FAILED_VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.FAILED_VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -151,7 +151,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
status = val.get_status status = val.get_status
self.assertEquals(status, 'FAILED') self.assertEqual(status, 'FAILED')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -160,7 +160,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
status = val.get_status status = val.get_status
self.assertEquals(status, 'FAILED') self.assertEqual(status, 'FAILED')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -169,7 +169,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
host_group = val.get_host_group host_group = val.get_host_group
self.assertEquals(host_group, 'undercloud') self.assertEqual(host_group, 'undercloud')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -178,7 +178,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
host_group = val.get_hosts_status host_group = val.get_hosts_status
self.assertEquals(host_group, 'undercloud,PASSED') self.assertEqual(host_group, 'undercloud,PASSED')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.FAILED_VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.FAILED_VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -187,7 +187,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
host_group = val.get_hosts_status host_group = val.get_hosts_status
self.assertEquals(host_group, 'undercloud,FAILED') self.assertEqual(host_group, 'undercloud,FAILED')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -196,7 +196,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
host_group = val.get_hosts_status host_group = val.get_hosts_status
self.assertEquals(host_group, 'undercloud,UNREACHABLE') self.assertEqual(host_group, 'undercloud,UNREACHABLE')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -205,7 +205,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
unreachable = val.get_unreachable_hosts unreachable = val.get_unreachable_hosts
self.assertEquals(unreachable, '') self.assertEqual(unreachable, '')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -214,7 +214,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
unreachable = val.get_unreachable_hosts unreachable = val.get_unreachable_hosts
self.assertEquals(unreachable, 'undercloud') self.assertEqual(unreachable, 'undercloud')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -223,7 +223,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
duration = val.get_duration duration = val.get_duration
self.assertEquals(duration, '0:00:03.753') self.assertEqual(duration, '0:00:03.753')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -232,7 +232,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
duration = val.get_duration duration = val.get_duration
self.assertEquals(duration, '') self.assertEqual(duration, '')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -241,7 +241,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
start_time = val.get_start_time start_time = val.get_start_time
self.assertEquals(start_time, '2019-11-25T13:40:14.404623Z') self.assertEqual(start_time, '2019-11-25T13:40:14.404623Z')
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -250,7 +250,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
start_time = val.get_start_time start_time = val.get_start_time
self.assertEquals(start_time, '') self.assertEqual(start_time, '')
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_log_not_found(self, mock_open): def test_log_not_found(self, mock_open):
@ -286,7 +286,7 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
plays = val.get_plays plays = val.get_plays
self.assertEquals( self.assertEqual(
plays, plays,
[fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]['plays'][0]['play']]) [fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]['plays'][0]['play']])
@ -297,7 +297,8 @@ class TestValidationLog(TestCase):
val = ValidationLog( val = ValidationLog(
logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json')
tasks_data = val.get_tasks_data tasks_data = val.get_tasks_data
self.assertEquals( self.assertEqual(
tasks_data, tasks_data,
[fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0] [
fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]
['validation_output'][0]['task']]) ['validation_output'][0]['task']])

34
validations_libs/tests/test_validation_logs.py
View File

@ -33,7 +33,7 @@ class TestValidationLogs(TestCase):
def test_validation_log_file(self, mock_open, mock_json): def test_validation_log_file(self, mock_open, mock_json):
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs._get_content('/tmp/foo/bar.json') content = vlogs._get_content('/tmp/foo/bar.json')
self.assertEquals(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST) self.assertEqual(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_log_not_found(self, mock_open): def test_log_not_found(self, mock_open):
@ -53,7 +53,7 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
log = vlogs.get_logfile_by_validation('foo') log = vlogs.get_logfile_by_validation('foo')
self.assertEquals(log, self.assertEqual(log,
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'])
@mock.patch('glob.glob') @mock.patch('glob.glob')
@ -66,7 +66,7 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs.get_logfile_content_by_validation('foo') content = vlogs.get_logfile_content_by_validation('foo')
self.assertEquals(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST) self.assertEqual(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
@mock.patch('glob.glob') @mock.patch('glob.glob')
@mock.patch('json.load') @mock.patch('json.load')
@ -76,7 +76,7 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
log = vlogs.get_logfile_by_uuid('123') log = vlogs.get_logfile_by_uuid('123')
self.assertEquals(log, self.assertEqual(log,
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'])
@mock.patch('glob.glob') @mock.patch('glob.glob')
@ -89,7 +89,7 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs.get_logfile_content_by_uuid('123') content = vlogs.get_logfile_content_by_uuid('123')
self.assertEquals(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST) self.assertEqual(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
@mock.patch('glob.glob') @mock.patch('glob.glob')
@mock.patch('json.load') @mock.patch('json.load')
@ -100,7 +100,7 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
log = vlogs.get_logfile_by_uuid_validation_id('123', 'foo') log = vlogs.get_logfile_by_uuid_validation_id('123', 'foo')
self.assertEquals(log, self.assertEqual(log,
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'])
@mock.patch('glob.glob') @mock.patch('glob.glob')
@ -114,7 +114,7 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs.get_logfile_content_by_uuid_validation_id('123', 'foo') content = vlogs.get_logfile_content_by_uuid_validation_id('123', 'foo')
self.assertEquals(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST) self.assertEqual(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
@mock.patch('os.path.isfile') @mock.patch('os.path.isfile')
@mock.patch('os.listdir') @mock.patch('os.listdir')
@ -128,7 +128,7 @@ class TestValidationLogs(TestCase):
mock_isfile.return_value = True mock_isfile.return_value = True
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
log = vlogs.get_all_logfiles() log = vlogs.get_all_logfiles()
self.assertEquals(log, self.assertEqual(log,
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'])
@mock.patch('os.path.isfile') @mock.patch('os.path.isfile')
@ -144,7 +144,7 @@ class TestValidationLogs(TestCase):
mock_isfile.return_value = True mock_isfile.return_value = True
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
log = vlogs.get_all_logfiles(extension='yaml') log = vlogs.get_all_logfiles(extension='yaml')
self.assertEquals(log, self.assertEqual(log,
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.yaml']) ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.yaml'])
@mock.patch('os.path.isfile') @mock.patch('os.path.isfile')
@ -160,7 +160,7 @@ class TestValidationLogs(TestCase):
mock_isfile.return_value = True mock_isfile.return_value = True
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
log = vlogs.get_all_logfiles() log = vlogs.get_all_logfiles()
self.assertEquals(log, self.assertEqual(log,
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'])
@mock.patch('os.path.isfile') @mock.patch('os.path.isfile')
@ -175,7 +175,7 @@ class TestValidationLogs(TestCase):
mock_isfile.return_value = True mock_isfile.return_value = True
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs.get_all_logfiles_content() content = vlogs.get_all_logfiles_content()
self.assertEquals(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST) self.assertEqual(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
@mock.patch('json.load', @mock.patch('json.load',
return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
@ -184,7 +184,7 @@ class TestValidationLogs(TestCase):
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs.get_validations_stats( content = vlogs.get_validations_stats(
fakes.VALIDATIONS_LOGS_CONTENTS_LIST) fakes.VALIDATIONS_LOGS_CONTENTS_LIST)
self.assertEquals(content, fakes.VALIDATIONS_STATS) self.assertEqual(content, fakes.VALIDATIONS_STATS)
@mock.patch('validations_libs.validation_logs.ValidationLogs.' @mock.patch('validations_libs.validation_logs.ValidationLogs.'
'get_logfile_by_uuid_validation_id') 'get_logfile_by_uuid_validation_id')
@ -196,7 +196,8 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs.get_results(uuid='123', validation_id='foo') content = vlogs.get_results(uuid='123', validation_id='foo')
self.assertEquals(content, [{'UUID': '123', self.assertEqual(content, [{
'UUID': '123',
'Validations': 'foo', 'Validations': 'foo',
'Status': 'PASSED', 'Status': 'PASSED',
'Status_by_Host': 'undercloud,PASSED', 'Status_by_Host': 'undercloud,PASSED',
@ -219,7 +220,9 @@ class TestValidationLogs(TestCase):
['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']
vlogs = ValidationLogs('/tmp/foo') vlogs = ValidationLogs('/tmp/foo')
content = vlogs.get_results(uuid=['123', '123'], validation_id='foo') content = vlogs.get_results(uuid=['123', '123'], validation_id='foo')
self.assertEquals(content, [{'UUID': '123', self.assertEqual(content, [
{
'UUID': '123',
'Validations': 'foo', 'Validations': 'foo',
'Status': 'PASSED', 'Status': 'PASSED',
'Status_by_Host': 'undercloud,PASSED', 'Status_by_Host': 'undercloud,PASSED',
@ -227,7 +230,8 @@ class TestValidationLogs(TestCase):
'Unreachable_Hosts': '', 'Unreachable_Hosts': '',
'Duration': '0:00:03.753', 'Duration': '0:00:03.753',
'Validations': 'foo'}, 'Validations': 'foo'},
{'UUID': '123', {
'UUID': '123',
'Validations': 'foo', 'Validations': 'foo',
'Status': 'PASSED', 'Status': 'PASSED',
'Status_by_Host': 'undercloud,PASSED', 'Status_by_Host': 'undercloud,PASSED',