diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 287: Merge changes

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

Commit Message

Dave Pigott May 17, 2012, 2:04 p.m. UTC 
Merge authors:
  Dave Pigott (dpigott)
Related merge proposals:
  https://code.launchpad.net/~dpigott/lava-dispatcher/timeout-changes/+merge/106163
  proposed by: Dave Pigott (dpigott)
  review: Approve - Fathi Boudra (fboudra)
------------------------------------------------------------
revno: 287 [merge]
committer: dave.pigott@linaro.org
branch nick: trunk
timestamp: Thu 2012-05-17 15:02:04 +0100
message:
  Merge changes
modified:
  lava_dispatcher/client/base.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
diff mbox

Patch

=== modified file 'lava_dispatcher/client/base.py'
--- lava_dispatcher/client/base.py	2012-04-23 05:51:22 +0000
+++ lava_dispatcher/client/base.py	2012-05-17 13:02:48 +0000
@@ -383,13 +383,16 @@ 
         if lava_proxy:
             logging.info("Setting up http proxy")
             # haven't included Android support yet
+            # Timeout is 30 seconds because of some underlying
+            # problem that causes these commands to sometimes
+            # take around 15-20 seconds.
             self.proc.sendline("export http_proxy=%s" % lava_proxy)
-            self.proc.expect(prompt_str, timeout=10)
+            self.proc.expect(prompt_str, timeout=30)
             self.proc.sendline("echo 'Acquire::http::proxy \"%s\";' > /etc/apt/apt.conf.d/30proxy" % lava_proxy)
-            self.proc.expect(prompt_str, timeout=10)
+            self.proc.expect(prompt_str, timeout=30)
         else:
             self.proc.sendline("echo '' > /etc/apt/apt.conf.d/30proxy")
-            self.proc.expect(prompt_str, timeout=10)
+            self.proc.expect(prompt_str, timeout=30)
 
 
     def boot_master_image(self):