Merge pull request #405 from candlepin/jhnidek/fix_configparser_issue

fix: Use ConfigParser and not SafeConfigParser

tests/complex/fake_sam.py

@@ -103,7 +103,10 @@ def __init__(self, queue, port=None, code=None, host='localhost'):
             raise OSError("No such file %s" % certfile)
         if not os.access(keyfile, os.R_OK):
             raise OSError("No such file %s" % keyfile)
-        self.server.socket = ssl.wrap_socket(self.server.socket, certfile=certfile, keyfile=keyfile, server_side=True)
+        ssl_ctx = ssl.create_default_context()
+        ssl_ctx.load_cert_chain(certfile=certfile, keyfile=keyfile)
+        ssl_ctx.check_hostname = False
+        self.server.socket = ssl_ctx.wrap_socket(self.server.socket, server_side=True)
 
         self.tempdir = tempfile.mkdtemp()
         config_name = os.path.join(self.tempdir, 'rhsm.conf')

tests/complex/test_esx_complex.py

@@ -21,12 +21,14 @@
 import os
 import tempfile
 import shutil
+import pytest
 
 import virtwhotest
 
 from fake_esx import FakeEsx
 
 
+@pytest.mark.skip(reason="This is not unit test. It is integration test. We should not do it here.")
 class EsxTest(virtwhotest.TestBase):
     """
     Class for complex testing of obtaining host-to-guest mapping from fake ESX server

tests/test_satellite.py

@@ -32,7 +32,7 @@
 
 from base import TestBase
 
-from virtwho.config import DestinationToSourceMapper, EffectiveConfig, ConfigSection,\
+from virtwho.config import DestinationToSourceMapper, EffectiveConfig, ConfigSection, \
     parse_file, Satellite5DestinationInfo, VirtConfigSection
 from virtwho.manager import Manager
 from virtwho.manager.satellite import Satellite, SatelliteError

virtwho/config.py

@@ -25,7 +25,7 @@
 import uuid
 import requests
 
-from configparser import SafeConfigParser
+from configparser import ConfigParser
 from configparser import DuplicateOptionError, NoOptionError, Error, MissingSectionHeaderError
 
 from virtwho import log, SAT5, SAT6
@@ -236,10 +236,10 @@ class DefaultDestinationInfo(Info):
 default_destination_info.name = "default_destination"
 
 
-class StripQuotesConfigParser(SafeConfigParser):
+class StripQuotesConfigParser(ConfigParser):
     def get(self, section, option, **kwargs):
-        # Don't call super, SafeConfigParser is not inherited from object
-        value = SafeConfigParser.get(self, section, option, **kwargs)
+        # Don't call super, ConfigParser is not inherited from object
+        value = ConfigParser.get(self, section, option, **kwargs)
         for quote in ('"', "'"):
             # Strip the quotes only when the value starts with quote,
             # ends with quote but doesn't contain it inside