diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2014-10-23 20:56:15 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2014-11-21 12:14:44 +0100 |
| commit | 29c28786e35ee8e7fced740e62e0b5ddaa9bb381 (patch) | |
| tree | bc24f1fa77ab4887ce2d210960498806ffef9fdf /ipatests/test_integration/base.py | |
| parent | 0ad5c57f6243a7dbfc15af04b87e88f59c65409c (diff) | |
| download | freeipa-29c28786e35ee8e7fced740e62e0b5ddaa9bb381.tar.gz freeipa-29c28786e35ee8e7fced740e62e0b5ddaa9bb381.tar.xz freeipa-29c28786e35ee8e7fced740e62e0b5ddaa9bb381.zip | |
Integration tests: Port the BeakerLib plugin and log collection to pytest
Move the IPA-specific log collection out of the Beakerlib plugin.
Add the --logfile-dir option to tests and ipa-test-task, so that logs
can be collected even if BeakerLib is not used.
https://fedorahosted.org/freeipa/ticket/4610
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_integration/base.py')
| -rw-r--r-- | ipatests/test_integration/base.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ipatests/test_integration/base.py b/ipatests/test_integration/base.py index 60b0f02a9..c8b98126e 100644 --- a/ipatests/test_integration/base.py +++ b/ipatests/test_integration/base.py @@ -30,6 +30,7 @@ log = log_mgr.get_logger(__name__) @ordered @pytest.mark.usefixtures('integration_config') +@pytest.mark.usefixtures('integration_logs') class IntegrationTest(object): num_replicas = 0 num_clients = 0 @@ -83,10 +84,5 @@ class IntegrationTest(object): for client in cls.clients: tasks.uninstall_client(client) - @classmethod - def collect_log(cls, host, filename): - cls.log.info('Adding %s:%s to list of logs to collect' % - (host.external_hostname, filename)) - cls.logs_to_collect.setdefault(host, []).append(filename) IntegrationTest.log = log_mgr.get_logger(IntegrationTest()) |