Merge lp:~milo/lava-tool/integration-tests-fixes into lp:~linaro-validation/lava-tool/trunk

[Milo Casagrande]

The merge proposal fixes two integration tests failing.
Changes are explained in more detail in the commits:
- Enabled non "interactiveness" of the command line
- Renamed a parameter
- Changed how the server and rpc_endpoint parameters are treated (this might change again though, since to me it's not clear how they should really be used and the parameter names are generic enough).

[lp:~milo/lava-tool/integration-tests-fixes]

191. By Milo Casagrande on 2013-07-30

Corrected server/rpc_endpoint usage.

[Milo Casagrande (milo)]

Pushed a new change since there is another MP that fixes the logic of the server/rpc_endpoint parameters in the actual lava-tool code.

[lp:~milo/lava-tool/integration-tests-fixes]

192. By Milo Casagrande on 2013-07-31

Added trailing slash support for flask URL.

[Antonio Terceiro (terceiro)]

LGTM

review: Approve

=== modified file 'integration-tests.d/lava-job-new-with-config.sh'
--- integration-tests.d/lava-job-new-with-config.sh	2013-05-28 22:08:12 +0000
+++ integration-tests.d/lava-job-new-with-config.sh	2013-07-31 13:28:30 +0000
@@ -3,8 +3,8 @@
 device_type = panda
 
 [device_type=panda]
-prebuilt_image = file:///path/to/panda.img
+image = file:///path/to/panda.img
 EOF
-LAVACONFIG="${tmpdir}/config" lava job new "${tmpdir}/job.json"
+LAVACONFIG="${tmpdir}/config" lava job new "${tmpdir}/job.json" -n
 cat "${tmpdir}/job.json"
 grep "device_type.*panda" "${tmpdir}/job.json" && grep "image.*path.to.panda.img" "${tmpdir}/job.json"

=== modified file 'integration-tests.d/lava-job-submit.sh'
--- integration-tests.d/lava-job-submit.sh	2013-06-03 18:06:49 +0000
+++ integration-tests.d/lava-job-submit.sh	2013-07-31 13:28:30 +0000
@@ -8,5 +8,5 @@
 rpc_endpoint = http://localhost:5000/ok
 CONFIG
 
-lava job submit integration-tests.d/sample/nexus.json > $tmpdir/output
+lava job submit integration-tests.d/sample/nexus.json -n > $tmpdir/output
 grep "Job submitted with job ID 999" $tmpdir/output

=== modified file 'integration-tests.d/lib/server.py'
--- integration-tests.d/lib/server.py	2013-06-03 18:06:49 +0000
+++ integration-tests.d/lib/server.py	2013-07-31 13:28:30 +0000
@@ -1,5 +1,4 @@
 import os
-import sys
 import yaml
 
 from flask import (
@@ -25,7 +24,7 @@
     request.environ['werkzeug.server.shutdown']()
     return ""
 
[e-mail]('/<status_code>', methods=['GET', 'POST'])
[e-mail]('/<status_code>/', methods=['GET', 'POST'])
 def reply(status_code):
 
     status = int(aliases.get(status_code, status_code))