Merge lp:~joetalbott/adt-to-utah/add_commands into lp:adt-to-utah

Proposed by Joe Talbott
Status: Merged
Approved by: Para Siva
Approved revision: 9
Merged at revision: 9
Proposed branch: lp:~joetalbott/adt-to-utah/add_commands
Merge into: lp:adt-to-utah
Diff against target: 74 lines (+24/-3)
2 files modified
adt_to_utah/__init__.py (+21/-1)
adt_to_utah/tests/test_adt_to_utah.py (+3/-2)
To merge this branch: bzr merge lp:~joetalbott/adt-to-utah/add_commands
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Para Siva (community) Approve
Review via email: mp+256052@code.launchpad.net

Commit message

Parse testcases and include "commands" in utah results.

Description of the change

Parse testcases and include "commands" in utah results.

To post a comment you must log in.
Revision history for this message
Para Siva (psivaa) wrote :

LGTM, and tested on a summary file.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'adt_to_utah/__init__.py'
--- adt_to_utah/__init__.py 2015-04-09 19:49:59 +0000
+++ adt_to_utah/__init__.py 2015-04-13 22:38:25 +0000
@@ -64,11 +64,31 @@
64 }64 }
6565
6666
67def create_command_entry(result, success=True):
68 return {
69 'cmd_type': 'testcase_test',
70 'command': result,
71 'extra_info': {},
72 'probes': {},
73 'returncode': 0 if success else 1,
74 'start_time': '1970-01-01 00:00:00',
75 'time_delta': 0,
76 'user': None,
77 }
78
79
67def create_utah_data(result_data):80def create_utah_data(result_data):
68 # get rid of microseconds since the utah parser doesn't support81 # get rid of microseconds since the utah parser doesn't support
69 # them.82 # them.
70 now = datetime.datetime.utcnow().replace(microsecond=0)83 now = datetime.datetime.utcnow().replace(microsecond=0)
71 ran_at = result_data.get('ran_at', now.isoformat(' '))84 ran_at = result_data.get('ran_at', now.isoformat(' '))
85
86 commands = []
87 for result in result_data["passes"]:
88 commands.append(create_command_entry(result))
89 for result in result_data["failures"]:
90 commands.append(create_command_entry(result, success=False))
91
72 return {92 return {
73 "passes": len(result_data["passes"]),93 "passes": len(result_data["passes"]),
74 "failures": len(result_data["failures"]),94 "failures": len(result_data["failures"]),
@@ -77,7 +97,7 @@
77 "ran_at": ran_at,97 "ran_at": ran_at,
7898
79 # defaults99 # defaults
80 "commands": [],100 "commands": commands,
81 "errors": 0,101 "errors": 0,
82 "fetch_errors": 0,102 "fetch_errors": 0,
83 "runlist": "",103 "runlist": "",
84104
=== modified file 'adt_to_utah/tests/test_adt_to_utah.py'
--- adt_to_utah/tests/test_adt_to_utah.py 2015-04-09 19:49:59 +0000
+++ adt_to_utah/tests/test_adt_to_utah.py 2015-04-13 22:38:25 +0000
@@ -70,10 +70,11 @@
7070
71 self.assertNotIn('.', utah_data['ran_at'])71 self.assertNotIn('.', utah_data['ran_at'])
7272
73 self.assertEqual(2, len(utah_data['commands']))
74
73 # defaults75 # defaults
74 self.assertEqual(0, utah_data['errors'])76 self.assertEqual(0, utah_data['errors'])
75 self.assertEqual(0, utah_data['fetch_errors'])77 self.assertEqual(0, utah_data['fetch_errors'])
76 self.assertEqual([], utah_data['commands'])
77 self.assertEqual('', utah_data['runlist'])78 self.assertEqual('', utah_data['runlist'])
78 self.assertEqual('', utah_data['uname'])79 self.assertEqual('', utah_data['uname'])
79 self.assertEqual('', utah_data['install_type'])80 self.assertEqual('', utah_data['install_type'])
@@ -99,11 +100,11 @@
99 self.assertEqual("vivid", utah_data['release'])100 self.assertEqual("vivid", utah_data['release'])
100 self.assertNotEqual('', utah_data['ran_at'])101 self.assertNotEqual('', utah_data['ran_at'])
101 self.assertNotIn('.', utah_data['ran_at'])102 self.assertNotIn('.', utah_data['ran_at'])
103 self.assertEqual(2, len(utah_data['commands']))
102104
103 # defaults105 # defaults
104 self.assertEqual(0, utah_data['errors'])106 self.assertEqual(0, utah_data['errors'])
105 self.assertEqual(0, utah_data['fetch_errors'])107 self.assertEqual(0, utah_data['fetch_errors'])
106 self.assertEqual([], utah_data['commands'])
107 self.assertEqual('', utah_data['runlist'])108 self.assertEqual('', utah_data['runlist'])
108 self.assertEqual('', utah_data['uname'])109 self.assertEqual('', utah_data['uname'])
109 self.assertEqual('', utah_data['install_type'])110 self.assertEqual('', utah_data['install_type'])

Subscribers

People subscribed via source and target branches

to all changes: