Skip to content

Commit

Permalink
Rename assertion method argument name from "values" to "parameters".
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kami
Kami committed Apr 12, 2016
1 parent feb0209 commit f0fb101
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
18 changes: 9 additions & 9 deletions contrib/packs/tests/test_action_aliases.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def test_pack_deploy_alias(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

command = 'pack deploy StackStorm/st2contrib packs libcloud branch ma_branch'
expected_parameters = {
Expand All @@ -27,7 +27,7 @@ def test_pack_deploy_alias(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

# Command without branch
format_string = self.action_alias_db.formats[0]['representation'][1]
Expand All @@ -38,7 +38,7 @@ def test_pack_deploy_alias(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

command = 'pack deploy StackStorm/st2contrib packs libcloud'
expected_parameters = {
Expand All @@ -47,7 +47,7 @@ def test_pack_deploy_alias(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

# Doesnt include packs
format_string = self.action_alias_db.formats[1]['representation'][0]
Expand All @@ -58,7 +58,7 @@ def test_pack_deploy_alias(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

format_string = self.action_alias_db.formats[1]['representation'][1]
command = 'pack deploy StackStorm/st2contrib'
Expand All @@ -67,7 +67,7 @@ def test_pack_deploy_alias(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)


class PackInfoActionAliasTestCase(BaseActionAliasTestCase):
Expand All @@ -81,15 +81,15 @@ def test_pack_info_alias(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

command = 'pack info aws'
expected_parameters = {
'pack': 'aws'
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)


class ShowGitCloneActionAliasTestCase(BaseActionAliasTestCase):
Expand All @@ -103,4 +103,4 @@ def test_show_git_cline(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)
6 changes: 3 additions & 3 deletions st2common/tests/unit/test_pack_action_alias_unit_testing_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_assertExtractedParametersMatch_success(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

format_string = self.action_alias_db.formats[0]
command = 'show last 10 metrics for my.host.example'
Expand All @@ -40,7 +40,7 @@ def test_assertExtractedParametersMatch_success(self):
}
self.assertExtractedParametersMatch(format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

def test_assertExtractedParametersMatch_command_doesnt_match_format_string(self):
format_string = self.action_alias_db.formats[0]
Expand All @@ -53,7 +53,7 @@ def test_assertExtractedParametersMatch_command_doesnt_match_format_string(self)
self.assertExtractedParametersMatch,
format_string=format_string,
command=command,
values=expected_parameters)
parameters=expected_parameters)

def test_assertCommandMatchesExactlyOneFormatString(self):
# Matches single format string
Expand Down
8 changes: 4 additions & 4 deletions st2tests/st2tests/action_aliases.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def assertCommandMatchesExactlyOneFormatString(self, format_strings, command):
(command, ', '.join(matched_format_strings)))
raise AssertionError(msg)

def assertExtractedParametersMatch(self, format_string, command, values):
def assertExtractedParametersMatch(self, format_string, command, parameters):
"""
Assert that the provided command matches the format string.
Expand All @@ -80,13 +80,13 @@ def assertExtractedParametersMatch(self, format_string, command, values):
format_str=format_string,
param_stream=command)

if extracted_params != values:
if extracted_params != parameters:
msg = ('Extracted parameters from command string "%s" against format string "%s"'
' didn\'t match the provided values: ' % (command, format_string))
' didn\'t match the provided parameters: ' % (command, format_string))

# Note: We intercept the exception so we can can include diff for the dictionaries
try:
self.assertEqual(extracted_params, values)
self.assertEqual(extracted_params, parameters)
except AssertionError as e:
msg += str(e)

Expand Down

0 comments on commit f0fb101

Please sign in to comment.