Import Upstream version 4.12.4

ipatests/pytest_ipa/integration/config.py

@@ -44,6 +44,9 @@ class Config(pytest_multihost.config.Config):
         'domain_level',
         'log_journal_since',
         'fips_mode',
+        'token_name',
+        'token_password',
+        'token_library',
     }
 
     def __init__(self, **kwargs):
@@ -69,6 +72,9 @@ class Config(pytest_multihost.config.Config):
         if self.domain_level is None:
             self.domain_level = MAX_DOMAIN_LEVEL
         self.fips_mode = kwargs.get('fips_mode', False)
+        self.token_name = kwargs.get('token_name', None)
+        self.token_password = kwargs.get('token_password', None)
+        self.token_library = kwargs.get('token_library', None)
 
     def get_domain_class(self):
         return Domain
@@ -100,11 +106,11 @@ class Config(pytest_multihost.config.Config):
 
     @classmethod
     def from_env(cls, env):
-        from ipatests.pytest_ipa.integration.env_config import config_from_env
+        from .env_config import config_from_env  # pylint: disable=cyclic-import
         return config_from_env(env)
 
     def to_env(self, **kwargs):
-        from ipatests.pytest_ipa.integration.env_config import config_to_env
+        from .env_config import config_to_env  # pylint: disable=cyclic-import
         return config_to_env(self, **kwargs)
 
     def filter(self, descriptions):
@@ -156,7 +162,7 @@ class Domain(pytest_multihost.config.Domain):
             raise LookupError(self.type)
 
     def get_host_class(self, host_dict):
-        from ipatests.pytest_ipa.integration.host import Host, WinHost
+        from .host import Host, WinHost  # pylint: disable=cyclic-import
 
         if self.is_ipa_type:
             return Host