LAVA Dispatcher

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

  1. multinode
  2. Merge into multinode
Proposed by Neil Williams
Status: Merged
Approved by: Neil Williams
Approved revision: 637
Merged at revision: 637
Proposed branch: lp:~codehelp/lava-dispatcher/multinode
Merge into: lp:lava-dispatcher/multinode
Diff against target: 38 lines (+7/-6)
2 files modified
lava_dispatcher/actions/lava_test_shell.py (+5/-5)
lava_dispatcher/job.py (+2/-1)
To merge this branch: bzr merge lp:~codehelp/lava-dispatcher/multinode
Reviewer Review Type Date Requested Status
Fu Wei Approve
Review via email: mp+171101@code.launchpad.net

Description of the change

Fix typos in lava_test_shell.py and make the sample transport request valid for the receiver.

To post a comment you must log in.
Revision history for this message
Fu Wei (fu-wei) wrote :

Thank you very much for fixing those!
Sorry for those bugs.

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/lava_test_shell.py'
2--- lava_dispatcher/actions/lava_test_shell.py 2013-06-21 13:23:41 +0000
3+++ lava_dispatcher/actions/lava_test_shell.py 2013-06-24 14:44:37 +0000
4@@ -566,15 +566,15 @@
5 if foutname == LAVA_GROUP_FILE:
6 fout.write('LAVA_GROUP="\n')
7 for unit in self.context.test_data.metadata['target_group']:
8- fout.write(r"\t%s\t%s\n\" "\n" % (unit['target'], \
9- unit['role'])
10+ fout.write(r"\t%s\t%s\n\\n" % (unit['target'],
11+ unit['role']))
12 fout.write('"\n')
13 elif foutname == LAVA_ROLE_FILE:
14- fout.write("TARGET_ROLE='%s'\n" % self.context.test_data.metadata['role']
15+ fout.write("TARGET_ROLE='%s'\n" % self.context.test_data.metadata['role'])
16 elif foutname == LAVA_SELF_FILE:
17- fout.write("HOSTNAME='%s'\n" % self.context.test_data.metadata['hostname']
18+ fout.write("HOSTNAME='%s'\n" % self.context.test_data.metadata['hostname'])
19 else:
20- fout.write("LAVA_TEST_BIN='%s/bin'\n" % target.deployment_data['lava_test_dir']
21+ fout.write("LAVA_TEST_BIN='%s/bin'\n" % target.deployment_data['lava_test_dir'])
22 fout.write(fin.read())
23 os.fchmod(fout.fileno(), XMOD)
24
25
26=== modified file 'lava_dispatcher/job.py'
27--- lava_dispatcher/job.py 2013-06-24 08:52:50 +0000
28+++ lava_dispatcher/job.py 2013-06-24 14:44:37 +0000
29@@ -192,7 +192,8 @@
30 # prototype for the NodeDispatcher call to be used later in lava_test_shell.
31 if self.transport:
32 from lava.dispatcher.node import NodeDispatcher
33- self.transport("foo")
34+ msg={"request": "lava_sync", "message": "foo"}
35+ self.transport(json.dumps(msg))
36
37 if self.job_data['actions'][-1]['command'].startswith(
38 "submit_results"):

Subscribers

People subscribed via source and target branches

to status/vote changes: