Fix tests

Author: frenzymadness

tests/test_ethtool.py

@@ -64,7 +64,8 @@ def assertRaisesIOError(self, fn, args, errmsg):
             fn(*args)
         except IOError as e:
             # Check the details of the exception:
-            self.assertEquals(e.args, (errmsg, ))
+            enum, emsg = e.args
+            self.assertEquals('[Errno {}] {}'.format(enum, emsg), errmsg)
         else:
             self.fail('IOError was not raised calling %s on %s' % (fn, args))
 
@@ -99,23 +100,20 @@ def _functions_accepting_devnames(self, devname):
             scraped = ifconfig.get_device_by_name(devname)
 
             self.assertIsString(ethtool.get_broadcast(devname))
-            self.assertEqualIpv4Str(ethtool.get_broadcast(devname),
-                                    scraped.broadcast)
+
+            # Broadcast is optional in ifconfig output
+            if scraped.broadcast:
+                self.assertEqualIpv4Str(ethtool.get_broadcast(devname),
+                                        scraped.broadcast)
 
             self.assertIsStringExceptForLoopback(ethtool.get_businfo, devname,
                                                  '[Errno 95] Operation not supported')
 
-            # ethtool.get_coalesce(devname)
-            # this gives me:
-            #   IOError: [Errno 95] Operation not supported
-            # on my test box
-
             self.assertIsInt(ethtool.get_flags(devname))
             # flagsint cannot be obtained from old ifconfig format
             if not ifconfig.oldFormat:
                 self.assertEqual(ethtool.get_flags(devname), scraped.flagsint)
             self.assertIsInt(ethtool.get_gso(devname))
-    
             self.assertIsString(ethtool.get_hwaddr(devname))
             self.assertEqualHwAddr(ethtool.get_hwaddr(devname),
                                    scraped.hwaddr)
@@ -124,26 +122,26 @@ def _functions_accepting_devnames(self, devname):
 
             self.assertIsStringExceptForLoopback(ethtool.get_module, devname,
                                                  '[Errno 95] Operation not supported')
-    
+
             self.assertIsString(ethtool.get_netmask(devname))
             self.assertEqual(ethtool.get_netmask(devname),
                              scraped.netmask)
-    
-            #self.assertRaisesIOError(ethtool.get_ringparam, (devname, ),
-            #                         '[Errno 95] Operation not supported')
-    
-            # Disabling until BZ#703089 is investigated
-            #self.assertIsInt(ethtool.get_sg(devname))
-            #self.assertIsInt(ethtool.get_ufo(devname))
-    
+
+            # Operation is not supported only on loopback device
+            if devname == 'lo':
+                self.assertRaisesIOError(ethtool.get_ringparam, (devname, ),
+                                         '[Errno 95] Operation not supported')
+
+            self.assertIsInt(ethtool.get_sg(devname))
+            self.assertIsInt(ethtool.get_ufo(devname))
+
             self.assertIsInt(ethtool.get_tso(devname))
-    
-    
-            #TODO: self.assertIsString(ethtool.set_coalesce(devname))
-    
-            #TODO: self.assertIsString(ethtool.set_ringparam(devname))
 
-            #TODO: self.assertIsString(ethtool.set_tso(devname))
+            # TODO: self.assertIsString(ethtool.set_coalesce(devname))
+
+            # TODO: self.assertIsString(ethtool.set_ringparam(devname))
+
+            # TODO: self.assertIsString(ethtool.set_tso(devname))
 
     def _verify_etherinfo_object(self, ei):
         self.assert_(isinstance(ei, ethtool.etherinfo))
@@ -159,17 +157,17 @@ def _verify_etherinfo_object(self, ei):
             self.assertEqual(ei.ipv4_address, scraped.inet)
 
         self.assertIsStringOrNone(ei.ipv4_broadcast)
-        if scraped:
+        if scraped and scraped.broadcast:
+            # Broadcast is optional
             self.assertEqual(ei.ipv4_broadcast, scraped.broadcast)
 
         self.assertIsInt(ei.ipv4_netmask)
         if scraped:
             self.assertEqual(ei.ipv4_netmask, scraped.get_netmask_bits())
 
         self.assertIsStringOrNone(ei.mac_address)
-        if scraped:
-            if scraped.hwaddr:
-                scraped.hwaddr = scraped.hwaddr.lower()
+        if scraped and scraped.hwaddr and scraped.hwtitle.lower() != 'unspec':
+            scraped.hwaddr = scraped.hwaddr.lower()
             self.assertEqualHwAddr(ei.mac_address.lower(), scraped.hwaddr)
 
         i6s = ei.get_ipv6_addresses()
@@ -178,10 +176,6 @@ def _verify_etherinfo_object(self, ei):
             self.assertIsString(i6.address)
             self.assertIsInt(i6.netmask)
             self.assertIsString(i6.scope)
-            self.assertEquals(str(i6),
-                              '[%s] %s/%i' % (i6.scope, 
-                                              i6.address,
-                                              i6.netmask))
 
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     #  tests
@@ -208,16 +202,15 @@ def test_invalid_devices(self):
                 self.assertRaisesNoSuchDevice(getattr(ethtool, fnname),
                                               INVALID_DEVICE_NAME, 42)
 
-
     def test_get_interface_info_invalid(self):
         eis = ethtool.get_interfaces_info(INVALID_DEVICE_NAME)
         self.assertEquals(len(eis), 1)
         ei = eis[0]
         self.assertEquals(ei.device, INVALID_DEVICE_NAME)
+        self.assertEquals(ei.ipv4_netmask, 0)
         self.assertEquals(ei.ipv4_address, None)
         self.assertEquals(ei.ipv4_broadcast, None)
-        self.assertEquals(ei.ipv4_netmask, 0)
-        self.assertEquals(ei.mac_address, None)
+        self.assertRaisesIOError(getattr, (ei, 'mac_address'), '[Errno 19] No such device')
 
     def test_get_interface_info_active(self):
         eis = ethtool.get_interfaces_info(ethtool.get_active_devices())
@@ -231,6 +224,9 @@ def test_get_interface_info_all(self):
 
     def test_get_active_devices(self):
         for devname in ethtool.get_active_devices():
+            # Skip these test on tun devices
+            if devname.startswith('tun'):
+                continue
             self._functions_accepting_devnames(devname)
 
     def test_etherinfo_objects(self):