1
=== modified file 'plainbox/plainbox/impl/box.py'
2
--- plainbox/plainbox/impl/box.py	2013-02-26 13:53:45 +0000
3
+++ plainbox/plainbox/impl/box.py	2013-03-03 16:45:25 +0000
4
@@ -415,7 +415,8 @@
5
415
        else:
415
        else:
6
416
            job_result = JobResult({
416
            job_result = JobResult({
7
417
                'job': job,
417
                'job': job,
9
418
                'outcome': JobResult.OUTCOME_NOT_SUPPORTED
418
                'outcome': JobResult.OUTCOME_NOT_SUPPORTED,
10
419
                'comments': job_state.get_readiness_description()
11
419
            })
420
            })
12
420
        if job_result is None and not ns.dry_run:
421
        if job_result is None and not ns.dry_run:
13
421
            logger.warning("Job %s did not return a result", job)
422
            logger.warning("Job %s did not return a result", job)
14
422
423
15
=== modified file 'plainbox/plainbox/impl/exporter/__init__.py'
16
--- plainbox/plainbox/impl/exporter/__init__.py	2013-02-25 11:02:59 +0000
17
+++ plainbox/plainbox/impl/exporter/__init__.py	2013-03-03 16:45:25 +0000
18
@@ -73,6 +73,7 @@
19
73
    OPTION_WITH_RESOURCE_MAP = 'with-resource-map'
73
    OPTION_WITH_RESOURCE_MAP = 'with-resource-map'
20
74
    OPTION_WITH_JOB_DEFS = 'with-job-defs'
74
    OPTION_WITH_JOB_DEFS = 'with-job-defs'
21
75
    OPTION_WITH_ATTACHMENTS = 'with-attachments'
75
    OPTION_WITH_ATTACHMENTS = 'with-attachments'
22
76
    OPTION_WITH_COMMENTS = 'with-comments'
23
76
77
24
77
    SUPPORTED_OPTION_LIST = (
78
    SUPPORTED_OPTION_LIST = (
25
78
        OPTION_WITH_IO_LOG,
79
        OPTION_WITH_IO_LOG,
26
@@ -83,6 +84,7 @@
27
83
        OPTION_WITH_RESOURCE_MAP,
84
        OPTION_WITH_RESOURCE_MAP,
28
84
        OPTION_WITH_JOB_DEFS,
85
        OPTION_WITH_JOB_DEFS,
29
85
        OPTION_WITH_ATTACHMENTS,
86
        OPTION_WITH_ATTACHMENTS,
30
87
        OPTION_WITH_COMMENTS,
31
86
    )
88
    )
32
87
89
33
88
    def __init__(self, option_list=None):
90
    def __init__(self, option_list=None):
34
@@ -139,6 +141,9 @@
35
139
                continue
141
                continue
36
140
            data['result_map'][job_name] = OrderedDict()
142
            data['result_map'][job_name] = OrderedDict()
37
141
            data['result_map'][job_name]['outcome'] = job_state.result.outcome
143
            data['result_map'][job_name]['outcome'] = job_state.result.outcome
38
144
            if self.OPTION_WITH_COMMENTS in self._option_list:
39
145
                data['result_map'][job_name]['comments'] = \
40
146
                    job_state.result.comments
41
142
147
42
143
            # Add Job definitions if requested
148
            # Add Job definitions if requested
43
144
            if self.OPTION_WITH_JOB_DEFS in self._option_list:
149
            if self.OPTION_WITH_JOB_DEFS in self._option_list:
44
145
150
45
=== modified file 'plainbox/plainbox/impl/exporter/test_init.py'
46
--- plainbox/plainbox/impl/exporter/test_init.py	2013-02-21 11:17:48 +0000
47
+++ plainbox/plainbox/impl/exporter/test_init.py	2013-03-03 16:45:25 +0000
48
@@ -124,6 +124,7 @@
49
124
            'job': job_b,
124
            'job': job_b,
50
125
            'outcome': 'pass',
125
            'outcome': 'pass',
51
126
            'return_code': 0,
126
            'return_code': 0,
52
127
            'comments': 'foo',
53
127
            'io_log': make_io_log(
128
            'io_log': make_io_log(
54
128
                (IOLogRecord(0, 'stdout', b'ready: yes\n'),),
129
                (IOLogRecord(0, 'stdout', b'ready: yes\n'),),
55
129
                session_dir)
130
                session_dir)
56
@@ -160,13 +161,15 @@
57
160
                    'plugin': 'shell',
161
                    'plugin': 'shell',
58
161
                    'command': 'echo testing && true',
162
                    'command': 'echo testing && true',
59
162
                    'io_log': ['dGVzdGluZwo='],
163
                    'io_log': ['dGVzdGluZwo='],
61
163
                    'requires': 'job_b.ready == "yes"'
164
                    'requires': 'job_b.ready == "yes"',
62
165
                    'comments': None,
63
164
                },
166
                },
64
165
                'job_b': {
167
                'job_b': {
65
166
                    'outcome': 'pass',
168
                    'outcome': 'pass',
66
167
                    'plugin': 'resource',
169
                    'plugin': 'resource',
67
168
                    'command': 'echo ready: yes',
170
                    'command': 'echo ready: yes',
68
169
                    'io_log': ['cmVhZHk6IHllcwo='],
171
                    'io_log': ['cmVhZHk6IHllcwo='],
69
172
                    'comments': 'foo',
70
170
                }
173
                }
71
171
            },
174
            },
72
172
            'attachment_map': {
175
            'attachment_map': {
73
173
176
74
=== modified file 'plainbox/plainbox/impl/test_box.py'
75
--- plainbox/plainbox/impl/test_box.py	2013-02-26 14:55:20 +0000
76
+++ plainbox/plainbox/impl/test_box.py	2013-03-03 16:45:25 +0000
77
@@ -338,9 +338,9 @@
78
338
            self.assertEqual(call.exception.args, (0,))
338
            self.assertEqual(call.exception.args, (0,))
79
339
        expected = """
339
        expected = """
80
340
        Each format may support a different set of options
340
        Each format may support a different set of options
84
341
        json: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments, machine-json
341
        json: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments, with-comments, machine-json
85
342
        rfc822: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments
342
        rfc822: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments, with-comments
86
343
        text: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments
343
        text: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments, with-comments
87
344
        """
344
        """
88
345
        self.assertEqual(io.combined, cleandoc(expected) + "\n")
345
        self.assertEqual(io.combined, cleandoc(expected) + "\n")
89
346
346
Status:	Merged
Approved by:	Zygmunt Krynicki on 2013-03-08
Approved revision:	1960
Merged at revision:	1970
Proposed branch:	lp:~sylvain-pineau/checkbox/export_comments
Merge into:	lp:checkbox
Diff against target:	88 lines (+14/-5) 4 files modified plainbox/plainbox/impl/box.py (+2/-1) plainbox/plainbox/impl/exporter/__init__.py (+5/-0) plainbox/plainbox/impl/exporter/test_init.py (+4/-1) plainbox/plainbox/impl/test_box.py (+3/-3)
To merge this branch:	bzr merge lp:~sylvain-pineau/checkbox/export_comments
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Zygmunt Krynicki (community)		2013-03-03	Approve on 2013-03-03
Review via email: mp+151392@code.launchpad.net