Bug 1417554 - Use a session scoped fixture for obtaining the host IP addresses. r=ahal
authorDave Hunt <dhunt@mozilla.com>
Thu, 16 Nov 2017 11:09:54 +0000
changeset 437493 017c3d88e600d3ae2c3b0d454c25b243cdf54094
parent 437492 3b9b4134fbe8f6f00bbaac951525ed326139811a
child 437494 d7bbf8608707360a478e2d9f98d36173b6709a3b
push id117
push userfmarier@mozilla.com
push dateTue, 28 Nov 2017 20:17:16 +0000
reviewersahal
bugs1417554
milestone59.0a1
Bug 1417554 - Use a session scoped fixture for obtaining the host IP addresses. r=ahal MozReview-Commit-ID: GlsmAlneKiH
testing/mozbase/moznetwork/tests/test.py
--- a/testing/mozbase/moznetwork/tests/test.py
+++ b/testing/mozbase/moznetwork/tests/test.py
@@ -8,29 +8,22 @@ from __future__ import absolute_import
 import mock
 import mozinfo
 import moznetwork
 import re
 import subprocess
 from distutils.spawn import find_executable
 
 import mozunit
+import pytest
 
 
-def verify_ip_in_list(ip):
-    """
-    Helper Method to check if `ip` is listed in Network Adresses
-    returned by ipconfig/ifconfig, depending on the platform in use
-
-    :param ip: IPv4 address in the xxx.xxx.xxx.xxx format as a string
-                Example Usage:
-                    verify_ip_in_list('192.168.0.1')
-
-    returns True if the `ip` is in the list of IPs in ipconfig/ifconfig
-    """
+@pytest.fixture(scope='session')
+def ip_addresses():
+    """List of IP addresses associated with the host."""
 
     # Regex to match IPv4 addresses.
     # 0-255.0-255.0-255.0-255, note order is important here.
     regexip = re.compile("((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}"
                          "(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)")
 
     commands = (
         ['ip', 'addr', 'show'],
@@ -50,45 +43,31 @@ def verify_ip_in_list(ip):
     else:
         raise OSError("No program for detecting ip address found! Ensure one of 'ip', "
                       "'ifconfig' or 'ipconfig' exists on your $PATH.")
 
     ps = subprocess.Popen(cmd, stdout=subprocess.PIPE)
     standardoutput, standarderror = ps.communicate()
 
     # Generate a list of IPs by parsing the output of ip/ifconfig
-    ip_list = [x.group() for x in re.finditer(regexip, standardoutput)]
-
-    # Check if ip is in list
-    if ip in ip_list:
-        return True
-    else:
-        return False
+    return [x.group() for x in re.finditer(regexip, standardoutput)]
 
 
-def test_get_ip():
+def test_get_ip(ip_addresses):
     """ Attempt to test the IP address returned by
     moznetwork.get_ip() is valid """
-
-    ip = moznetwork.get_ip()
-
-    # Check the IP returned by moznetwork is in the list
-    assert verify_ip_in_list(ip)
+    assert moznetwork.get_ip() in ip_addresses
 
 
-def test_get_ip_using_get_interface():
+def test_get_ip_using_get_interface(ip_addresses):
     """ Test that the control flow path for get_ip() using
     _get_interface_list() is works """
 
     if mozinfo.isLinux or mozinfo.isMac:
 
         with mock.patch('socket.gethostbyname') as byname:
             # Force socket.gethostbyname to return None
             byname.return_value = None
-
-            ip = moznetwork.get_ip()
-
-            # Check the IP returned by moznetwork is in the list
-            assert verify_ip_in_list(ip)
+            assert moznetwork.get_ip() in ip_addresses
 
 
 if __name__ == '__main__':
     mozunit.main()