Skip to content

Commit c5d8e63

Browse files
committed
use mock.path.object to create DURATION_HOURS response object
1 parent 7430732 commit c5d8e63

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

st2client/tests/fixtures/execution_with_hours_in_elapsed_time.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
},
1919
"status": "succeeded",
2020
"start_timestamp": "2014-12-02T19:56:06.900000Z",
21-
"end_timestamp": "2014-12-03T21:58:07.000000Z",
21+
"end_timestamp": "2014-12-02T21:56:07.000000Z",
2222
"action": {
2323
"ref": "core.ping"
2424
},
2525
"liveaction": {
2626
"callback": {},
2727
"id": "1"
2828
}
29-
}
29+
}

st2client/tests/unit/test_formatters.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ def test_execution_get_attributes(self):
115115
content = self._get_execution(argv)
116116
self.assertEqual(content, FIXTURES['results']['execution_get_attributes.txt'])
117117

118-
def test_execution_get_attribute_with_hours_in_elapsed_time(self):
119-
argv = ['execution', 'get', DURATION_HOURS['id'], '--attr', 'status']
120-
content = self._get_execution(argv)
121-
self.assertEqual(content, FIXTURES['results']['execution_get_attribute_with_hours_in_elapsed_time.txt'])
122118

123119
def test_execution_get_default_in_json(self):
124120
argv = ['execution', 'get', EXECUTION['id'], '-j']
@@ -138,6 +134,18 @@ def test_execution_with_schema(self):
138134
content = self._get_schema_execution(argv)
139135
self.assertEqual(content, FIXTURES['results']['execution_get_has_schema.txt'])
140136

137+
@mock.patch.object(
138+
httpclient.HTTPClient, 'get',
139+
mock.MagicMock(return_value=base.FakeResponse(json.dumps(DURATION_HOURS), 200, 'OK', {})))
140+
def test_execution_get_attribute_with_hours_in_elapsed_time(self):
141+
argv = ['execution', 'get', DURATION_HOURS['id']]
142+
self.assertEqual(self.shell.run(argv), 0)
143+
self._undo_console_redirect()
144+
with open(self.path, 'r') as fd:
145+
content = fd.read()
146+
147+
self.assertEqual(content, FIXTURES['results']['execution_get_attribute_with_hours_in_elapsed_time.txt'])
148+
141149
@mock.patch.object(
142150
httpclient.HTTPClient, 'get',
143151
mock.MagicMock(return_value=base.FakeResponse(json.dumps(NEWLINE), 200, 'OK', {})))

0 commit comments

Comments
 (0)