From 79fd13f0000498d4cf415f7e60e40037689b7276 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Thu, 23 Mar 2017 12:28:11 -0400
Subject: [PATCH] Set test timout to 300 seconds

This prevents tests from hanging indefinitely, which we
are seeing in the trigger crash dump tests, which are
also skipped in this patch.

Partial-Bug: #1675526

Change-Id: If4858040187834ccdebb3f83bfbfa14d5d3251fc
---
 .testr.conf                                               | 5 ++++-
 novaclient/tests/functional/v2/test_trigger_crash_dump.py | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.testr.conf b/.testr.conf
index 0aae11096..c8fae426b 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,7 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./novaclient/tests/unit} $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-300} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./novaclient/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/novaclient/tests/functional/v2/test_trigger_crash_dump.py b/novaclient/tests/functional/v2/test_trigger_crash_dump.py
index 27180ac5a..bf556eec8 100644
--- a/novaclient/tests/functional/v2/test_trigger_crash_dump.py
+++ b/novaclient/tests/functional/v2/test_trigger_crash_dump.py
@@ -12,10 +12,13 @@
 
 import time
 
+from tempest.lib import decorators
+
 from novaclient.tests.functional import base
 from novaclient.v2 import shell
 
 
+@decorators.skip_because(bug="1675526")
 class TestTriggerCrashDumpNovaClientV217(base.TenantTestBase):
     """Functional tests for trigger crash dump"""