summaryrefslogtreecommitdiffstats
path: root/conductor
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-02-06 16:21:22 -0800
committerDileep Ranganathan <dileep.ranganathan@intel.com>2018-02-06 16:21:22 -0800
commita2978cc38c116a89329d7ee262b4b0409c2a7bca (patch)
treedfd661aebfeee29a71a7ed0f2fe10367a6620528 /conductor
parentd067098d0fbc8718cc56446464e3363755ac04b3 (diff)
Added missing .testr.conf in conductor
Missing .testr.conf is added. Bumped os-testr version in test-requirements.txt to 1.0.0 Issue-ID: OPTFRA-76 Change-Id: Icaacf67402be4ba6edbdc3edc587dc0e95166f30 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Diffstat (limited to 'conductor')
-rw-r--r--conductor/.testr.conf8
-rw-r--r--conductor/test-requirements.txt2
2 files changed, 9 insertions, 1 deletions
diff --git a/conductor/.testr.conf b/conductor/.testr.conf
new file mode 100644
index 0000000..a5ec473
--- /dev/null
+++ b/conductor/.testr.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+ OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
+ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
+ ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./conductor/tests/unit} $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/conductor/test-requirements.txt b/conductor/test-requirements.txt
index 8eb4eb7..6bd93c6 100644
--- a/conductor/test-requirements.txt
+++ b/conductor/test-requirements.txt
@@ -15,6 +15,6 @@ psycopg2>=2.5 # LGPL/ZPL
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
-os-testr>=0.4.1 # Apache-2.0
+os-testr>=1.0.0 # Apache-2.0
tempest>=11.0.0 # Apache-2.0
pifpaf>=0.0.11 \ No newline at end of file