Merge lp:~bladernr/checkbox/1128017-improve-network_check into lp:checkbox

[Jeff Lane ]

Improves network_check by adding the ability to test against a URL other than cdimage.ubuntu.com. This is useful when the test simply fails and needs a bit of debug to validate that the issue is not simply that cdimage.ubuntu.com is not accessible by the user for some reason.

[Zygmunt Krynicki (zyga)]

24 + help='The target URL to try. Default is %(default)s')

default is not interpolated unless you do some bit of argparse magic (grep for default in plainbox to see)

Otherwise ok

[lp:~bladernr/checkbox/1128017-improve-network_check]

2099. By Jeff Lane  on 2013-05-03

"[r=zkrynicki][bug=1103647][author=bladernr] automatic merge by tarmac"

2100. By Brendan Donegan on 2013-05-03

"[r=zkrynicki][bug=1093718][author=brendan-donegan] automatic merge by tarmac"

[Jeff Lane  (bladernr)]

default is interpolated automatically IF you provide a default="foo" in the arg definition.

bladernr@klaatu:~/development/git-workspace/checkbox/scripts$ ./network_check -h
usage: network_check [-h] [-u URL] [-a]

optional arguments:
  -h, --help show this help message and exit
  -u URL, --url URL The target URL to try. Default is
                     http://cdimage.ubuntu.com
  -a, --auto Runs in Automated mode, with no visible output

note that it automatically converts %(default)s to "http://cdimage.ubuntu.com" which is set as the default here:

parser.add_argument('-u', '--url',
                        action='store',
                        default='http://cdimage.ubuntu.com',
                        help='The target URL to try. Default is %(default)s')

[lp:~bladernr/checkbox/1128017-improve-network_check]

2101. By Jeff Lane  on 2013-05-03

"[r=brendan-donegan][bug=1100594][author=bladernr] automatic merge by tarmac"

[Jeff Lane  (bladernr)]

Rebased on current trunk

[lp:~bladernr/checkbox/1128017-improve-network_check]

2102. By Jeff Lane  on 2013-05-03

scripts: network_check: Added --url option for easier debugging

[Zygmunt Krynicki (zyga)]

+1 lovely, thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-03 14:32:25 +0000
+++ debian/changelog	2013-05-03 19:09:28 +0000
@@ -13,6 +13,8 @@
   * jobs/camera.txt.in: removed an extraneous requres line for gir1.2
     scripts/camera_test: added code to determine what version of gst we're
     using and set video type and plugin accordingly. (LP: #1100594)
+  * scripts/network_check: added ability to specify custom target URL for
+    debugging failures (LP: #1128017)
 
   [ Sylvain Pineau ]
   * jobs/suspend.txt.in, scripts/gpu_test: Remove the need of running the script

=== modified file 'scripts/network_check'
--- scripts/network_check	2012-10-25 07:37:51 +0000
+++ scripts/network_check	2013-05-03 19:09:28 +0000
@@ -27,6 +27,10 @@
     Check HTTP and connection
     """
     parser = ArgumentParser()
+    parser.add_argument('-u', '--url',
+                        action='store',
+                        default='http://cdimage.ubuntu.com',
+                        help='The target URL to try. Default is %(default)s')
     parser.add_argument('-a', '--auto',
                         action='store_true',
                         default=False,
@@ -34,7 +38,7 @@
 
     args = parser.parse_args()
 
-    url = {"http": "http://cdimage.ubuntu.com"}
+    url = {"http": args.url}
 
     results = {}
     for protocol, value in url.items():