Merge lp:~rodsmith/checkbox/fix-net-speed-detection into lp:checkbox

[Rod Smith]

On a Cavium Thunder (ARM64) system, ethtool outputs less information than on (most? all?) AMD64 systems. This causes the network test to fail to identify the network speed, resulting in a default "pass" result even when the network is under-performing. This patch broadens the scope of the search for the link speed in the network test, causing correct behavior on both AMD64 and Cavium systems -- that is, a reported failure when the network test actually fails.

[Sylvain Pineau (sylvain-pineau)]

Weird indeed. Thanks for the fix Rod

review: Approve

[Jeff Lane  (bladernr)]

Well, Sylvain beat me to it... ack

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/network'
--- providers/plainbox-provider-checkbox/bin/network	2016-07-21 19:17:18 +0000
+++ providers/plainbox-provider-checkbox/bin/network	2016-10-05 16:25:41 +0000
@@ -296,14 +296,14 @@
             logging.error(e.output)
             ethinfo = None
         finally:
-            expression = '(\\d+)(base)([A-Z]+)'
+            expression = '(\\d+)(base)([A-Z]+)|(\d+)(Mb/s)'
             regex = re.compile(expression)
             speeds = [0]
             if ethinfo:
                 for i in ethinfo:
                     hit = regex.search(i)
                     if hit:
-                        speeds.append(int(hit.group(1)))
+                        speeds.append(int(re.sub("\D", "", hit.group(0))))
             return max(speeds)
 
     @property