Small test fixes

Author: seveas

test/__init__.py

@@ -31,7 +31,7 @@ def assertIsStrictSubclass(self, klass1, klass2):
 
     def assertIsIpAddress(self, ip):
         try:
-            ipaddress.ip_address(ip)
+            ipaddress.ip_address(six.text_type(ip))
         except ValueError as e:
             raise self.failureException(str(e))
 

test/test_ipconfig.py

@@ -47,7 +47,8 @@ def do_check(self, thing):
                 self.assertLessEqual(metric, 1000)
             for data in c.RouteData:
                 self.assertIsIpNetwork(data['dest'], data['prefix'])
-                self.assertIsIpAddress(data['next-hop'])
+                if 'next-hop' in data:
+                    self.assertIsIpAddress(data['next-hop'])
                 self.assertLessEqual(data['metric'], 1000)
 
 if __name__ == '__main__':