Browse Source

Revert "Fix for HP 3rd Party CI failure"

This reverts commit 4f5b96e84c.

The commit edited .testr.conf which caused unit tests to be skipped
altogehter, and that is obviously not the right thing to do.

Conflicts:
	tox.ini

Change-Id: I404e725f33e20f75c33bb794f326e46176d54f10
stable/ocata
armando-migliaccio 6 years ago
parent
commit
7729b3ad33
3 changed files with 4 additions and 25 deletions
  1. +1
    -1
      .testr.conf
  2. +0
    -14
      tools/pretty_tox_serial.sh
  3. +3
    -10
      tox.ini

+ 1
- 1
.testr.conf View File

@ -2,7 +2,7 @@
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./networking_l2gw/tests/api} $LISTOPT $IDOPTION
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./networking_l2gw/tests/unit} $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE
test_list_option=--list

+ 0
- 14
tools/pretty_tox_serial.sh View File

@ -1,14 +0,0 @@
#!/usr/bin/env bash
set -o pipefail
TESTRARGS=$@
if [ ! -d .testrepository ]; then
testr init
fi
testr run --subunit $TESTRARGS | subunit-trace -f -n
retval=$?
testr slowest
exit $retval

+ 3
- 10
tox.ini View File

@ -9,13 +9,8 @@ usedevelop = True
install_command = {toxinidir}/tools/tox_install.sh {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals =
sh
bash
find
commands =
find . -type f -name "*.pyc" -delete
bash tools/pretty_tox_serial.sh '{posargs}'
whitelist_externals = sh
commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:pep8]
commands =
@ -41,9 +36,7 @@ builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
[testenv:api]
# This must be set manually in your environment until
# a new release of tox fixes the issues with setenv
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
setenv = OS_TEST_PATH=./networking_l2gw/tests/api
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
OS_TEST_API_WITH_REST=1
OS_TEST_TIMEOUT=90

Loading…
Cancel
Save