From b8cf212e8bbe301f6d44551ecac063d12a042520 Mon Sep 17 00:00:00 2001 From: Oleg Fayans Date: Wed, 21 Sep 2016 11:48:30 +0200 Subject: tests: Replaced unused setUp method with install setUp method does not get executed in recent versions of pytest Replaced with the install method derived from the parent IntegrationTest class Reviewed-By: David Kupka --- ipatests/test_integration/test_caless.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ipatests/test_integration') diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py index 88eec0ad5..f362517f2 100644 --- a/ipatests/test_integration/test_caless.py +++ b/ipatests/test_integration/test_caless.py @@ -766,13 +766,13 @@ class TestServerInstall(CALessBase): class TestReplicaInstall(CALessBase): num_replicas = 1 - def setUp(self): - # Install the master for every test - self.export_pkcs12('ca1/server') - with open(self.pem_filename, 'w') as f: - f.write(self.get_pem('ca1')) - - result = self.install_server() + @classmethod + def install(cls, mh): + super(TestReplicaInstall, cls).install(mh) + cls.export_pkcs12('ca1/server') + with open(cls.pem_filename, 'w') as f: + f.write(cls.get_pem('ca1')) + result = cls.install_server() assert result.returncode == 0 @replica_install_teardown -- cgit