Skip to content

Commit 51035da

Browse files
author
Eugen Cusmaunsa
committed
Fix st2chatops e2e tests Slack format
Fixes formatting for Slack, changed recently in the upstream and failing the st2cicd e2e
1 parent 6f384e7 commit 51035da

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

packs/chatops_tests/actions/test_aliases_with_slack.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def test_run_command_on_localhost_with_bad_argument(self):
279279

280280
# Check the pretext
281281
msg_pretext = messages[0]['attachments'][0]['pretext']
282-
self.assertRegex(msg_pretext, r"<@{userid}>: I'm sorry, Dave. I'm afraid I can't do that. ".format(userid=self.userid))
282+
self.assertRegex(msg_pretext, r"<@{userid}>: I'm sorry, Dave. I'm afraid I can't do that.".format(userid=self.userid))
283283

284284
# Test attachment
285285
msg_text = messages[0]['attachments'][0]['text']
@@ -921,7 +921,7 @@ def test_alias_with_custom_result_format(self):
921921
'Details are as follows:\n'
922922
'Host: `localhost`\n'
923923
' ---&gt; stdout: ChatOps run command with custom result format\n'
924-
' ---&gt; stderr: \n')
924+
' ---&gt; stderr:')
925925
self.assertEqual(msg_text, expected_text)
926926

927927
# Drain the event buffer
@@ -973,10 +973,10 @@ def test_alias_with_custom_result_format_and_multiple_hosts(self):
973973
expected_details = 'Details are as follows:\n'
974974
expected_127_0_0_1 = ('Host: `127.0.0.1`\n'
975975
' ---&gt; stdout: ChatOps run command with custom result format on multiple hosts\n'
976-
' ---&gt; stderr: \n')
976+
' ---&gt; stderr:')
977977
expected_localhost = ('Host: `localhost`\n'
978978
' ---&gt; stdout: ChatOps run command with custom result format on multiple hosts\n'
979-
' ---&gt; stderr: \n')
979+
' ---&gt; stderr:')
980980
self.assertIn(expected_report, msg_text)
981981
self.assertIn(expected_details, msg_text)
982982
self.assertIn(expected_127_0_0_1, msg_text)
@@ -1051,7 +1051,7 @@ def test_attachment_and_plaintext_backup(self):
10511051
self.assertIsNotNone(messages[1]['attachments'][0].get('text'))
10521052

10531053
# Check the pretext
1054-
self.assertEqual(messages[1]['attachments'][0]['pretext'], '<@{userid}>: action completed! '.format(userid=self.userid))
1054+
self.assertEqual(messages[1]['attachments'][0]['pretext'], '<@{userid}>: action completed!'.format(userid=self.userid))
10551055

10561056
# Test attachment
10571057
self.assertEqual(messages[1]['attachments'][0]['fallback'],
@@ -1094,14 +1094,14 @@ def test_fields_parameter(self):
10941094
self.assertIsNotNone(messages[1]['attachments'][0].get('text'))
10951095

10961096
# Check the pretext
1097-
self.assertEqual(messages[1]['attachments'][0]['pretext'], r'<@{userid}>: your kittens are here! '.format(userid=self.userid))
1097+
self.assertEqual(messages[1]['attachments'][0]['pretext'], r'<@{userid}>: your kittens are here!'.format(userid=self.userid))
10981098

10991099
# Test fallback
11001100
self.assertEqual(messages[1]['attachments'][0]['fallback'],
11011101
messages[1]['attachments'][0]['text'])
11021102

11031103
# Test attachment
1104-
self.assertEqual(messages[1]['attachments'][0]['text'], ' Regards from the Box Kingdom.')
1104+
self.assertEqual(messages[1]['attachments'][0]['text'], 'Regards from the Box Kingdom.')
11051105
self.assertEqual(messages[1]['attachments'][0]['fields'],
11061106
[
11071107
{
@@ -1155,7 +1155,7 @@ def test_jinja_input_parameters(self):
11551155
self.assertIsNotNone(messages[1]['attachments'][0].get('text'))
11561156

11571157
# Check the pretext
1158-
self.assertEqual(messages[1]['attachments'][0]['pretext'], r'<@{userid}>: '.format(userid=self.userid))
1158+
self.assertEqual(messages[1]['attachments'][0]['pretext'], r'<@{userid}>:'.format(userid=self.userid))
11591159

11601160
# Test fallback
11611161
self.assertEqual(messages[1]['attachments'][0]['fallback'],

0 commit comments

Comments
 (0)