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

[Brendan Donegan]

Wireless cards do not show the interface speed in /sys/class/net/<interface>/speed, so instead we need to find it from iwconfig. This merge request updates the Interface class of the network script to do this.

Unmerged revisions

2487. By Brendan Donegan on 2013-11-04

scripts/network - get wireless speed from iwconfig (LP: #1247141)

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-11-01 15:29:38 +0000
+++ checkbox-old/debian/changelog	2013-11-04 17:19:03 +0000
@@ -1,6 +1,7 @@
 checkbox (0.16.15) UNRELEASED; urgency=low
 
-  * Incremented changelog
+  [ Brendan Donegan ]
+  * scripts/network - get wireless speed from iwconfig (LP: #1247141)
 
  -- Brendan Donegan <[e-mail]>  Fri, 01 Nov 2013 15:29:31 +0000
 

=== modified file 'checkbox-old/scripts/network'
--- checkbox-old/scripts/network	2013-10-30 19:31:54 +0000
+++ checkbox-old/scripts/network	2013-11-04 17:19:03 +0000
@@ -275,8 +275,16 @@
     def _read_data(self, type):
         try:
             return open(os.path.join(self.dev_path, type)).read().strip()
+        except FileNotFoundError:
+            print("{}: Attribute not found".format(type))
         except OSError:
-            print("{}: Attribute not found".format(type))
+            return None
+
+    def _iwconfig_max_speed(self):
+        iwconfig = check_output(['iwconfig', self.interface],
+                                universal_newlines=True)
+        bit_rate = re.search('(?<=Bit Rate=)[0-9]*', iwconfig)
+        return int(bit_rate.group())
 
     @property
     def ipaddress(self):
@@ -302,7 +310,11 @@
 
     @property
     def max_speed(self):
-        return self._read_data("speed")
+        import pdb; pdb.set_trace()
+        max_speed = self._read_data("speed")
+        if not max_speed:
+            max_speed = self._iwconfig_max_speed()
+        return max_speed
 
     @property
     def macaddress(self):