diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-12-11 18:31:10 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-03-05 10:00:58 +0100 |
| commit | 8e2bceffa3afe110332ef8850e86c399f5eece3a (patch) | |
| tree | dadf1da4a62919f9f3ae2a35ed0bdff3a94a23c9 /ipatests/test_integration/host.py | |
| parent | 56f0430f522f2d4dfd0d8a120cfbc04424d6b648 (diff) | |
| download | freeipa-8e2bceffa3afe110332ef8850e86c399f5eece3a.tar.gz freeipa-8e2bceffa3afe110332ef8850e86c399f5eece3a.tar.xz freeipa-8e2bceffa3afe110332ef8850e86c399f5eece3a.zip | |
test_integration.config: Do not save the input environment
Using the input environment saved in self._session_env
outside of the config loading meant that methods of
configuration other than environment variables wouldn't
be possible.
Restructure the roles/extra_roles to not depend on _session_env.
Part of the work for: https://fedorahosted.org/freeipa/ticket/3938
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_integration/host.py')
| -rw-r--r-- | ipatests/test_integration/host.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipatests/test_integration/host.py b/ipatests/test_integration/host.py index 507e19ed6..a35602a97 100644 --- a/ipatests/test_integration/host.py +++ b/ipatests/test_integration/host.py @@ -128,7 +128,8 @@ class BaseHost(object): env['MYBEAKERHOSTNAME'] = self.external_hostname env['MYIP'] = self.ip - prefix = 'TESTHOST_' if self.role in self.domain.extra_roles else '' + prefix = ('' if self.role in self.domain.static_roles + else TESTHOST_PREFIX) env['MYROLE'] = '%s%s%s' % (prefix, role, self.domain._env) env['MYENV'] = str(self.domain.index) |