diff --git a/ignition/model/progress_events.py b/ignition/model/progress_events.py index a759ae8..054201e 100644 --- a/ignition/model/progress_events.py +++ b/ignition/model/progress_events.py @@ -18,8 +18,8 @@ def _details(self): return {} def to_dict(self): - return OrderedDict({ + return { 'eventType': BASE_EVENT_TYPE, 'progressEventType': self.progress_event_type, 'details': self._details() - }) + } diff --git a/tests/unit/model/test_progress_events.py b/tests/unit/model/test_progress_events.py index 2aaa9ef..2e70351 100644 --- a/tests/unit/model/test_progress_events.py +++ b/tests/unit/model/test_progress_events.py @@ -30,7 +30,6 @@ def test_init_without_progress_event_type_raises_error(self): def test_to_dict(self): event = ResourceTransitionProgressEvent(progress_event_type='TestEvent') to_dict_result = event.to_dict() - self.assertIsInstance(to_dict_result, OrderedDict) self.assertEqual(to_dict_result['eventType'], 'ResourceTransitionProgressEvent') self.assertEqual(to_dict_result['progressEventType'], 'TestEvent') self.assertEqual(to_dict_result['details'], {}) @@ -38,13 +37,11 @@ def test_to_dict(self): def test_to_dict_order(self): event = ResourceTransitionProgressEvent(progress_event_type='TestEvent') to_dict_result = event.to_dict() - self.assertIsInstance(to_dict_result, OrderedDict) self.assertEqual(list(to_dict_result.keys()), ['eventType', 'progressEventType', 'details']) def test_to_dict_with_details(self): event = TestSubEvent(extra_details={'a': 'A', 'b': 'B'}) to_dict_result = event.to_dict() - self.assertIsInstance(to_dict_result, OrderedDict) self.assertEqual(to_dict_result['eventType'], 'ResourceTransitionProgressEvent') self.assertEqual(to_dict_result['progressEventType'], 'TestSubEvent') self.assertEqual(to_dict_result['details'], { diff --git a/tests/unit/service/test_progress_events.py b/tests/unit/service/test_progress_events.py index 183d473..de42790 100644 --- a/tests/unit/service/test_progress_events.py +++ b/tests/unit/service/test_progress_events.py @@ -23,10 +23,10 @@ def test_add_logs_flat_format(self, mock_logger): event = TestEvent(extra_details={'A': 123}) self.service.add(event) expected_str = '---[{0}]---'.format(BASE_EVENT_TYPE) - expected_str += '\neventType: {0}'.format(BASE_EVENT_TYPE) - expected_str += '\nprogressEventType: TestEvent' expected_str += '\ndetails:' - expected_str += '\n A: 123\n' + expected_str += '\n A: 123' + expected_str += '\neventType: {0}'.format(BASE_EVENT_TYPE) + expected_str += '\nprogressEventType: TestEvent\n' mock_logger.info.assert_called_once_with(expected_str) @patch('ignition.service.progress_events.logger') @@ -35,10 +35,10 @@ def test_add_logs_logstash_format(self, mock_log_type, mock_logger): mock_log_type.lower.return_value = 'logstash' event = TestEvent(extra_details={'A': 123}) self.service.add(event) - expected_str = 'eventType: {0}'.format(BASE_EVENT_TYPE) - expected_str += '\nprogressEventType: TestEvent' - expected_str += '\ndetails:' - expected_str += '\n A: 123\n' + expected_str = 'details:\n' + expected_str += ' A: 123\n' + expected_str += 'eventType: {0}'.format(BASE_EVENT_TYPE) + expected_str += '\nprogressEventType: TestEvent\n' mock_logger.info.assert_called_once_with(expected_str) def test_add_invalid_event(self):