From 8e9e47f2f06b4dcf017149699111e94ba7c1830b Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Tue, 24 Jan 2017 11:37:08 -0500
Subject: tests: No longer monkey patch httpretty for python 3.4.2

No shipping ubuntu has a python 3.4 that is less than 3.4.2.
Remove this workaround to avoid unnecessary complexity.

This reverts 04a60cf949.
---
 tests/unittests/helpers.py                        | 35 -----------------------
 tests/unittests/test_datasource/test_gce.py       |  2 +-
 tests/unittests/test_datasource/test_openstack.py |  3 +-
 tests/unittests/test_ec2_util.py                  |  4 +--
 4 files changed, 4 insertions(+), 40 deletions(-)

(limited to 'tests/unittests')

diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 64e56d98..a0933464 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -2,7 +2,6 @@
 
 from __future__ import print_function
 
-import functools
 import os
 import shutil
 import sys
@@ -29,7 +28,6 @@ PY2 = False
 PY26 = False
 PY27 = False
 PY3 = False
-FIX_HTTPRETTY = False
 
 _PY_VER = sys.version_info
 _PY_MAJOR, _PY_MINOR, _PY_MICRO = _PY_VER[0:3]
@@ -44,8 +42,6 @@ else:
         PY2 = True
     if (_PY_MAJOR, _PY_MINOR) >= (3, 0):
         PY3 = True
-        if _PY_MINOR == 4 and _PY_MICRO < 3:
-            FIX_HTTPRETTY = True
 
 
 # Makes the old path start
@@ -216,37 +212,6 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
         return root
 
 
-def import_httpretty():
-    """Import HTTPretty and monkey patch Python 3.4 issue.
-    See https://github.com/gabrielfalcao/HTTPretty/pull/193 and
-    as well as https://github.com/gabrielfalcao/HTTPretty/issues/221.
-
-    Lifted from
-    https://github.com/inveniosoftware/datacite/blob/master/tests/helpers.py
-    """
-    if not FIX_HTTPRETTY:
-        import httpretty
-    else:
-        import socket
-        old_SocketType = socket.SocketType
-
-        import httpretty
-        from httpretty import core
-
-        def sockettype_patch(f):
-            @functools.wraps(f)
-            def inner(*args, **kwargs):
-                f(*args, **kwargs)
-                socket.SocketType = old_SocketType
-                socket.__dict__['SocketType'] = old_SocketType
-            return inner
-
-        core.httpretty.disable = sockettype_patch(
-            httpretty.httpretty.disable
-        )
-    return httpretty
-
-
 class HttprettyTestCase(TestCase):
     # necessary as http_proxy gets in the way of httpretty
     # https://github.com/gabrielfalcao/HTTPretty/issues/122
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
index a5cced07..4f83454e 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/test_datasource/test_gce.py
@@ -4,6 +4,7 @@
 #
 # This file is part of cloud-init. See LICENSE file for license information.
 
+import httpretty
 import re
 
 from base64 import b64encode, b64decode
@@ -15,7 +16,6 @@ from cloudinit.sources import DataSourceGCE
 
 from .. import helpers as test_helpers
 
-httpretty = test_helpers.import_httpretty()
 
 GCE_META = {
     'instance/id': '123',
diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py
index 28e1833e..7bf55084 100644
--- a/tests/unittests/test_datasource/test_openstack.py
+++ b/tests/unittests/test_datasource/test_openstack.py
@@ -5,6 +5,7 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
 import copy
+import httpretty as hp
 import json
 import re
 
@@ -20,8 +21,6 @@ from cloudinit.sources import DataSourceOpenStack as ds
 from cloudinit.sources.helpers import openstack
 from cloudinit import util
 
-hp = test_helpers.import_httpretty()
-
 BASE_URL = "http://169.254.169.254"
 PUBKEY = u'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460\n'
 EC2_META = {
diff --git a/tests/unittests/test_ec2_util.py b/tests/unittests/test_ec2_util.py
index 71c2009f..65fdb519 100644
--- a/tests/unittests/test_ec2_util.py
+++ b/tests/unittests/test_ec2_util.py
@@ -1,12 +1,12 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
+import httpretty as hp
+
 from . import helpers
 
 from cloudinit import ec2_utils as eu
 from cloudinit import url_helper as uh
 
-hp = helpers.import_httpretty()
-
 
 class TestEc2Util(helpers.HttprettyTestCase):
     VERSION = 'latest'
-- 
cgit v1.2.3