Merge lp:~zyga/checkbox/fix-1483410 into lp:checkbox

[Zygmunt Krynicki]

This branch contains the upstream version of two patches for https://bugs.launchpad.net/ubuntu/+source/checkbox-support/+bug/1483410

[Maciej Kisielewski (kissiel)]

LGTM

review: Approve

=== modified file 'checkbox-support/checkbox_support/parsers/udevadm.py'
--- checkbox-support/checkbox_support/parsers/udevadm.py	2015-06-10 14:35:44 +0000
+++ checkbox-support/checkbox_support/parsers/udevadm.py	2015-08-11 11:03:33 +0000
@@ -803,7 +803,7 @@
                     self.devices[device._raw_path] = device
             stack.append(device)
 
-        for device in self.devices.values():
+        for device in list(self.devices.values()):
             if device.category in ("NETWORK", "WIRELESS", "OTHER"):
                 dev_interface = [
                     d for d in self.devices.values()

=== modified file 'checkbox-support/checkbox_support/tests/__init__.py'
--- checkbox-support/checkbox_support/tests/__init__.py	2014-05-20 18:54:18 +0000
+++ checkbox-support/checkbox_support/tests/__init__.py	2015-08-11 11:03:33 +0000
@@ -40,8 +40,9 @@
     """
     # Discover all unit tests. By simple convention those are kept in
     # python modules that start with the word 'test_' .
-    return defaultTestLoader.discover(
-        os.path.dirname(getabsfile(checkbox_support)))
+    start_dir = os.path.dirname(getabsfile(checkbox_support))
+    top_level_dir = os.path.normpath(os.path.join(start_dir, '..'))
+    return defaultTestLoader.discover(start_dir, top_level_dir=top_level_dir)
 
 
 def test_suite():