Merge lp:~brendan-donegan/checkbox/remove_ftp_check into lp:checkbox

[Brendan Donegan]

This branch removes the FTP part of the network_check script and keeps the HTTP bit. FTP is more likely to get blocked by firewalls and a passing HTTP test and failing FTP test in combination confuses users and tells us nothing about HW support.

[lp:~brendan-donegan/checkbox/remove_ftp_check]

1052. By Brendan Donegan on 2011-09-20

Added entry to debian changelog.

[Daniel Manrique (roadmr)]

I tested this and seems to work as advertised. Merging, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-20 15:42:18 +0000
+++ debian/changelog	2011-09-20 16:11:25 +0000
@@ -1,5 +1,8 @@
 checkbox (0.12.8) oneiric; urgency=low
 
+  [Brendan Donegan]
+  * Remove test for FTP connection from network_check script (LP: #854222)
+
   [Daniel Manrique]
   * Restored _recover attribute, re-enabling welcome and test selection
     screens (LP: #852204)

=== modified file 'scripts/network_check'
--- scripts/network_check	2010-06-17 19:40:31 +0000
+++ scripts/network_check	2011-09-20 16:11:25 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 """
-Check that it's possible to establish http and ftp connections against
+Check that it's possible to establish a http connection against
 ubuntu.com
 """
 from subprocess import call
@@ -22,7 +22,7 @@
 
 def main():
     """
-    Check HTTP and FTP connections
+    Check HTTP and connection
     """
     usage = 'Usage %prog [OPTIONS]'
     parser = OptionParser(usage)
@@ -33,8 +33,7 @@
     
     (options,args) = parser.parse_args()
 
-    url = {"http": "http://cdimage.ubuntu.com/daily/current/",
-           "ftp": "ftp://cdimage.ubuntu.com/cdimage/daily/current/",}
+    url = { "http": "http://cdimage.ubuntu.com/daily/current/" }
 
     results = {}
     for protocol, value in url.iteritems():
@@ -42,7 +41,6 @@
 
     bool2str = {True: 'Success', False: 'Failed'}
     message = ("HTTP connection: %(http)s\n"
-               "FTP connection: %(ftp)s\n"
                % dict([(protocol, bool2str[value])
                        for protocol, value in results.iteritems()]))