Merge "Increase default wait_timeout"
This commit is contained in:
commit
39c6bc0b91
|
@ -2258,7 +2258,7 @@ class PostgresqlSchemaFixture(fixtures.Fixture):
|
|||
|
||||
class BaseTestCase(testtools.TestCase):
|
||||
log = logging.getLogger("zuul.test")
|
||||
wait_timeout = 60
|
||||
wait_timeout = 90
|
||||
|
||||
def attachLogs(self, *args):
|
||||
def reader():
|
||||
|
|
|
@ -30,9 +30,6 @@ class TestZuulStream25(AnsibleZuulTestCase):
|
|||
ansible_remote = os.environ.get('ZUUL_REMOTE_IPV4')
|
||||
self.assertIsNotNone(ansible_remote)
|
||||
|
||||
# on some systems this test may run longer than 30 seconds
|
||||
self.wait_timeout = 60
|
||||
|
||||
def _run_job(self, job_name):
|
||||
# Keep the jobdir around so we can inspect contents if an
|
||||
# assert fails. It will be cleaned up anyway as it is contained
|
||||
|
|
|
@ -2618,7 +2618,6 @@ class TestPrePlaybooks(AnsibleZuulTestCase):
|
|||
# A temporary class to hold new tests while others are disabled
|
||||
|
||||
tenant_config_file = 'config/pre-playbook/main.yaml'
|
||||
wait_timeout = 60
|
||||
|
||||
def test_pre_playbook_fail(self):
|
||||
# Test that we run the post playbooks (but not the actual
|
||||
|
@ -2704,7 +2703,6 @@ class TestPrePlaybooks(AnsibleZuulTestCase):
|
|||
|
||||
class TestPostPlaybooks(AnsibleZuulTestCase):
|
||||
tenant_config_file = 'config/post-playbook/main.yaml'
|
||||
wait_timeout = 60
|
||||
|
||||
def test_post_playbook_abort(self):
|
||||
# Test that when we abort a job in the post playbook, that we
|
||||
|
|
Loading…
Reference in New Issue