diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 335: Display proxy setting to confirm if some error related with proxy config file

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

Commit Message

Spring Zhang June 27, 2012, 9:15 a.m. UTC 
Merge authors:
  Spring Zhang (qzhang)
Related merge proposals:
  https://code.launchpad.net/~qzhang/lava-dispatcher/echo-proxy-setting/+merge/112015
  proposed by: Spring Zhang (qzhang)
  review: Approve - Michael Hudson-Doyle (mwhudson)
------------------------------------------------------------
revno: 335 [merge]
committer: Spring Zhang <spring.zhang@linaro.org>
branch nick: lava-dispatcher
timestamp: Wed 2012-06-27 17:13:53 +0800
message:
  Display proxy setting to confirm if some error related with proxy config file
modified:
  lava_dispatcher/actions/lava-test.py
  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/actions/lava-test.py'
--- lava_dispatcher/actions/lava-test.py	2012-06-08 18:46:21 +0000
+++ lava_dispatcher/actions/lava-test.py	2012-06-26 07:02:55 +0000
@@ -143,8 +143,10 @@ 
             if lava_proxy:
                 session.run("sh -c 'export http_proxy=%s'" % lava_proxy)
                 session.run("echo 'Acquire::http::proxy \"%s\";' > /etc/apt/apt.conf.d/30proxy" % lava_proxy)
+                session.run("cat /etc/apt/apt.conf.d/30proxy")
             else:
                 session.run("echo '' > /etc/apt/apt.conf.d/30proxy")
+                session.run("cat /etc/apt/apt.conf.d/30proxy")
 
             _install_lava_test(self.client, session)
 

=== modified file 'lava_dispatcher/client/base.py'
--- lava_dispatcher/client/base.py	2012-06-26 05:08:49 +0000
+++ lava_dispatcher/client/base.py	2012-06-27 09:13:53 +0000
@@ -391,9 +391,13 @@ 
             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=30)
+            self.proc.sendline("cat /etc/apt/apt.conf.d/30proxy")
+            self.proc.expect(prompt_str, timeout=30)
         else:
             self.proc.sendline("echo '' > /etc/apt/apt.conf.d/30proxy")
             self.proc.expect(prompt_str, timeout=30)
+            self.proc.sendline("cat /etc/apt/apt.conf.d/30proxy")
+            self.proc.expect(prompt_str, timeout=30)
 
 
     def boot_master_image(self):