diff options
Diffstat (limited to 'tests/remote/test_remote_zuul_stream.py')
| -rw-r--r-- | tests/remote/test_remote_zuul_stream.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/tests/remote/test_remote_zuul_stream.py b/tests/remote/test_remote_zuul_stream.py index 76392c73f..9ac7b32b0 100644 --- a/tests/remote/test_remote_zuul_stream.py +++ b/tests/remote/test_remote_zuul_stream.py @@ -19,13 +19,13 @@ import textwrap from tests.base import AnsibleZuulTestCase -class TestZuulStream26(AnsibleZuulTestCase): +class FunctionalZuulStreamMixIn: tenant_config_file = 'config/remote-zuul-stream/main.yaml' - ansible_version = '2.6' + # This should be overriden in child classes. + ansible_version = '2.9' - def setUp(self): + def _setUp(self): self.log_console_port = 19000 + int(self.ansible_version.split('.')[1]) - super().setUp() self.fake_nodepool.remote_ansible = True ansible_remote = os.environ.get('ZUUL_REMOTE_IPV4') @@ -192,13 +192,21 @@ class TestZuulStream26(AnsibleZuulTestCase): self.assertLogLine(regex, text) -class TestZuulStream27(TestZuulStream26): +class TestZuulStream27(AnsibleZuulTestCase, FunctionalZuulStreamMixIn): ansible_version = '2.7' + def setUp(self): + super().setUp() + self._setUp() -class TestZuulStream28(TestZuulStream27): + +class TestZuulStream28(AnsibleZuulTestCase, FunctionalZuulStreamMixIn): ansible_version = '2.8' + def setUp(self): + super().setUp() + self._setUp() + def test_command(self): job = self._run_job('command') with self.jobLog(job): |