LAVA Dispatcher

Merge lp:~codehelp/lava-dispatcher/multinode-lngfix into lp:lava-dispatcher/multinode

  1. multinode-lngfix
  2. Merge into multinode
Proposed by Neil Williams
Status: Merged
Approved by: Neil Williams
Approved revision: 691
Merged at revision: 692
Proposed branch: lp:~codehelp/lava-dispatcher/multinode-lngfix
Merge into: lp:lava-dispatcher/multinode
Diff against target: 31 lines (+3/-4)
1 file modified
lava_dispatcher/actions/launch_control.py (+3/-4)
To merge this branch: bzr merge lp:~codehelp/lava-dispatcher/multinode-lngfix
Reviewer Review Type Date Requested Status
Antonio Terceiro Approve
Review via email: mp+182422@code.launchpad.net

Description of the change

This completes the fix for LNG measurements in MultiNode result bundle aggregation. Tests on staging.v.l.o with this applied now create usable result bundles.

To post a comment you must log in.
Revision history for this message
Antonio Terceiro (terceiro) wrote :

Nice!

 review approve

At some point we should make sure we are using a single json library
across the board to avoid this weird stuff happening.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/actions/launch_control.py'
2--- lava_dispatcher/actions/launch_control.py 2013-08-23 10:33:02 +0000
3+++ lava_dispatcher/actions/launch_control.py 2013-08-27 15:31:37 +0000
4@@ -24,8 +24,7 @@
5 import tempfile
6 import urlparse
7 import xmlrpclib
8-import json
9-
10+import simplejson
11 from lava_tool.authtoken import AuthenticatingServerProxy, MemoryAuthBackend
12
13 from linaro_dashboard_bundle.io import DocumentIO
14@@ -267,7 +266,7 @@
15 :raise: OperationFailed if the xmlrpclib call fails
16 """
17 dashboard = _get_dashboard(server, token)
18- json_bundle = json.dumps(bundle)
19+ json_bundle = simplejson.dumps(bundle)
20 try:
21 # make the put_pending xmlrpc call to store the bundle in the dashboard until the group is complete.
22 result = dashboard.put_pending(json_bundle, stream, group_name)
23@@ -291,7 +290,7 @@
24 :raise: OperationFailed if the xmlrpclib call fails
25 """
26 dashboard = _get_dashboard(server, token)
27- json_bundle = json.dumps(bundle)
28+ json_bundle = simplejson.dumps(bundle)
29 job_name = self.context.job_data.get("job_name", "LAVA Results")
30 try:
31 # make the put_group xmlrpc call to aggregate the bundles for the entire group & submit.

Subscribers

People subscribed via source and target branches

to status/vote changes: