diff mbox

[Branch,~linaro-validation/lava-tool/trunk] Rev 189: Fixes for integration tests.

Message ID 20130806084037.22025.49138.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Milo Casagrande Aug. 6, 2013, 8:40 a.m. UTC 
Merge authors:
  Milo Casagrande (milo)
Related merge proposals:
  https://code.launchpad.net/~milo/lava-tool/integration-tests-fixes/+merge/177637
  proposed by: Milo Casagrande (milo)
  review: Approve - Antonio Terceiro (terceiro)
------------------------------------------------------------
revno: 189 [merge]
committer: Milo Casagrande <milo@ubuntu.com>
branch nick: trunk
timestamp: Tue 2013-08-06 09:48:24 +0200
message:
  Fixes for integration tests.
modified:
  integration-tests.d/lava-job-new-with-config.sh
  integration-tests.d/lava-job-submit.sh
  integration-tests.d/lib/server.py


--
lp:lava-tool
https://code.launchpad.net/~linaro-validation/lava-tool/trunk

You are subscribed to branch lp:lava-tool.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-tool/trunk/+edit-subscription
diff mbox

Patch

=== 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-30 15:45:44 +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-30 17:42:36 +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:26:03 +0000
@@ -1,5 +1,4 @@ 
 import os
-import sys
 import yaml
 
 from flask import (
@@ -25,7 +24,7 @@ 
     request.environ['werkzeug.server.shutdown']()
     return ""
 
-@app.route('/<status_code>', methods=['GET', 'POST'])
+@app.route('/<status_code>/', methods=['GET', 'POST'])
 def reply(status_code):
 
     status = int(aliases.get(status_code, status_code))