Fix and add a test case for IPv6

Fixing and adding a test case in relation to the eventlet ipv6 fix
in patch set 23 (https://review.openstack.org/#/c/101079/).

  * pre-import eventlet for test case test_evnetlet_no_dnspython,
    which wasn't actually importing eventlet like it described.
  * add case test_no_evnetlet_no_dnspython

Change-Id: I55c40ed735781862f8352afb917058bf475d16fe
(cherry picked from commit 9447d37d653d87c89a1daf8f5affe41269beffbd)

1 files changed, 9 insertions, 2 deletions

diff --git a/glance/tests/unit/common/test_wsgi_ipv6.py b/glance/tests/unit/common/test_wsgi_ipv6.py
index 166917021..6d9e3f8ff 100644
--- a/glance/tests/unit/common/test_wsgi_ipv6.py
+++ b/glance/tests/unit/common/test_wsgi_ipv6.py
@@ -35,7 +35,9 @@ else:
     sys.exit(%d)
 """
 
-eventlet_no_dns = script % ('fake', '', 'yes', '', 1, 0)
+eventlet_no_dns = script % ('fake', 'import eventlet', 'foo', 'not', 1, 0)
+
+no_eventlet_no_dns = script % ('fake', '', 'foo', '', 1, 0)
 
 no_eventlet_no_greendns = script % ('dns', '', 'yes', '', 1, 0)
 
@@ -48,8 +50,13 @@ eventlet_greendns = script % ('dns', 'import eventlet', 'no', 'not', 0, 1)
 
 class IPv6ServerTest(test_utils.BaseTestCase):
 
+    def test_no_evnetlet_no_dnspython(self):
+        """Test eventlet not imported and dnspython not installed"""
+        rc = subprocess.call(['python', '-c', no_eventlet_no_dns])
+        self.assertEqual(0, rc)
+
     def test_evnetlet_no_dnspython(self):
-        """Test eventlet imported but dnspython not installed"""
+        """Test eventlet pre-imported but dnspython not installed"""
         rc = subprocess.call(['python', '-c', eventlet_no_dns])
         self.assertEqual(0, rc)