[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 75: Add lsb-release to dependencies, and some misc pep8 cleanups

Message ID 20110706185048.18276.49524.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Paul Larson July 6, 2011, 6:50 p.m.
------------------------------------------------------------
revno: 75
committer: Paul Larson <paul.larson@canonical.com>
branch nick: dispatcher-testing-branch
timestamp: Wed 2011-07-06 13:47:51 -0500
message:
  Add lsb-release to dependencies, and some misc pep8 cleanups
modified:
  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 'lava_dispatcher/actions/lava-test.py'
--- lava_dispatcher/actions/lava-test.py	2011-07-01 05:38:44 +0000
+++ lava_dispatcher/actions/lava-test.py	2011-07-06 18:47:51 +0000
@@ -25,19 +25,21 @@ 
 from lava_dispatcher.client import OperationFailed
 from lava_dispatcher.config import LAVA_RESULT_DIR, MASTER_STR, TESTER_STR
 
+
 class cmd_lava_test_run(BaseAction):
     def run(self, test_name, timeout=-1):
         #Make sure in test image now
         client = self.client
         client.in_test_shell()
         client.run_shell_command('mkdir -p %s' % LAVA_RESULT_DIR,
-            response = TESTER_STR)
+            response=TESTER_STR)
         client.export_display()
         bundle_name = test_name + "-" + datetime.now().strftime("%H%M%S")
         client.run_shell_command(
             'lava-test run %s -o %s/%s.bundle' % (
                 test_name, LAVA_RESULT_DIR, bundle_name),
-            response = TESTER_STR, timeout = timeout)
+            response=TESTER_STR, timeout=timeout)
+
 
 class cmd_lava_test_install(BaseAction):
     """
@@ -55,57 +57,61 @@ 
         #install bazaar in tester image
         client.run_shell_command(
             'mkdir -p /mnt/root',
-            response = MASTER_STR)
+            response=MASTER_STR)
         client.run_shell_command(
             'mount /dev/disk/by-label/testrootfs /mnt/root',
-            response = MASTER_STR)
+            response=MASTER_STR)
         client.run_shell_command(
             'cp -f /mnt/root/etc/resolv.conf /mnt/root/etc/resolv.conf.bak',
-            response = MASTER_STR)
+            response=MASTER_STR)
         client.run_shell_command(
             'cp -L /etc/resolv.conf /mnt/root/etc',
-            response = MASTER_STR)
+            response=MASTER_STR)
         #eliminate warning: Can not write log, openpty() failed
         #                   (/dev/pts not mounted?), does not work
         client.run_shell_command(
             'mount --rbind /dev /mnt/root/dev',
-            response = MASTER_STR)
+            response=MASTER_STR)
         client.run_shell_command(
             'chroot /mnt/root apt-get update',
-            response = MASTER_STR)
+            response=MASTER_STR)
         #Install necessary packages for build lava-test
+        cmd = ('chroot /mnt/root apt-get -y install bzr usbutils python-apt '
+            'python-setuptools python-simplejson lsb-release')
         client.run_shell_command(
-            'chroot /mnt/root apt-get -y install bzr usbutils python-apt python-setuptools python-simplejson',
-            response = MASTER_STR, timeout=2400)
+            cmd,
+            response=MASTER_STR, timeout=2400)
         client.run_shell_command(
             'chroot /mnt/root bzr branch lp:lava-test',
-            response = MASTER_STR)
+            response=MASTER_STR)
         client.run_shell_command(
             'chroot /mnt/root sh -c "cd lava-test && python setup.py install"',
-            response = MASTER_STR)
+            response=MASTER_STR)
 
         #Test if lava-test installed
         try:
             client.run_shell_command(
                 'chroot /mnt/root lava-test help',
-                response = "list-tests")
+                response="list-tests")
         except:
             raise OperationFailed("lava-test deployment failed")
 
         for test in tests:
             client.run_shell_command(
                 'chroot /mnt/root lava-test install %s' % test,
-                response = MASTER_STR)
+                response=MASTER_STR)
         #clean up
         client.run_shell_command(
             'cp -f /mnt/root/etc/resolv.conf.bak /mnt/root/etc/resolv.conf',
-            response = MASTER_STR)
+            response=MASTER_STR)
         client.run_shell_command(
             'rm -rf /mnt/root/lava-test',
-            response = MASTER_STR)
+            response=MASTER_STR)
+        cmd = ('cat /proc/mounts | awk \'{print $2}\' | grep "^/mnt/root/dev"'
+            '| sort -r | xargs umount')
         client.run_shell_command(
-            'cat /proc/mounts | awk \'{print $2}\' | grep "^/mnt/root/dev" | sort -r | xargs umount',
-            response = MASTER_STR)
+            cmd,
+            response=MASTER_STR)
         client.run_shell_command(
             'umount /mnt/root',
-            response = MASTER_STR)
+            response=MASTER_STR)