[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 90: Work around issue that causes overlapping commands after installing lava-test and not detecting t...

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

Commit Message

Paul Larson Aug. 19, 2011, 1:35 a.m.
------------------------------------------------------------
revno: 90
tags: 2011.08, release-0.2.0
committer: Paul Larson <paul.larson@linaro.org>
branch nick: lava-dispatcher
timestamp: Fri 2011-08-19 02:32:22 +0100
message:
  Work around issue that causes overlapping commands after installing lava-test and not detecting the command line afterwards
  
  Fix pip install command
  
  Fix example url in out-of-tree example test job
modified:
  doc/lava-out-of-tree-test-1.json
  lava_dispatcher/actions/lava-test.py


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

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

Patch

=== modified file 'doc/lava-out-of-tree-test-1.json'
--- doc/lava-out-of-tree-test-1.json	2011-08-18 20:38:38 +0000
+++ doc/lava-out-of-tree-test-1.json	2011-08-19 01:32:22 +0000
@@ -23,7 +23,7 @@ 
       "parameters":
         {
             "tests": ["glcompbench"],
-            "install_python": ["bzr+http//:bazaar.launchpad.net/~linaro-graphics-wg/+junk/linaro-graphics-wg-tests/#egg=linaro-graphics-wg-tests"]
+            "install_python": ["bzr+http://bazaar.launchpad.net/~linaro-graphics-wg/+junk/linaro-graphics-wg-tests/#egg=linaro-graphics-wg-tests"]
         }
     },
     {

=== modified file 'lava_dispatcher/actions/lava-test.py'
--- lava_dispatcher/actions/lava-test.py	2011-08-18 20:38:38 +0000
+++ lava_dispatcher/actions/lava-test.py	2011-08-19 01:32:22 +0000
@@ -89,6 +89,7 @@ 
         client.run_shell_command(
             'chroot /mnt/root lava-test help',
             response="list-test", timeout=10)
+        client.proc.expect(MASTER_STR, timeout=10)
     except:
         tb = traceback.format_exc()
         client.sio.write(tb)
@@ -123,7 +124,7 @@ 
         if install_python:
             for module in install_python:
                 client.run_shell_command("chroot /mnt/root apt-get -y install python-pip", response=MASTER_STR)
-                client.run_shell_command("chroot /mnt/root pip -e " + module, response=MASTER_STR)
+                client.run_shell_command("chroot /mnt/root pip install -e " + module, response=MASTER_STR)
 
         if register:
             for test_def_url in register: