Skip to content

Commit

Permalink
Merge pull request #259 from /issues/258
Browse files Browse the repository at this point in the history
Turn off uxsuccess validation in test harness
  • Loading branch information
cdent committed Sep 3, 2018
2 parents b773ea8 + 92377fc commit ede7cb7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
5 changes: 0 additions & 5 deletions gabbi/tests/gabbits_intercept/self.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ tests:
url: /
verbose: True

- name: get simple page xfail uxsuccess
xfail: true
url: /
verbose: True

- name: inheritance of defaults
response_headers:
x-gabbi-url: $SCHEME://$NETLOC/cow?alpha=1
Expand Down
5 changes: 2 additions & 3 deletions test-failskip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ shopt -u nocasematch

FAILS=12

GREP_FAIL_MATCH="expected failures=$FAILS,"
GREP_FAIL_MATCH="expected failures=$FAILS"
GREP_SKIP_MATCH="skipped=$SKIP,"
GREP_UXSUC_MATCH='unexpected successes=1'
# This skip is always 2 because the pytest tests don't
# run the live tests.
PYTEST_MATCH="$SKIP skipped, $FAILS xfailed"

stestr run && \
for match in "${GREP_FAIL_MATCH}" "${GREP_UXSUC_MATCH}" "${GREP_SKIP_MATCH}"; do
for match in "${GREP_FAIL_MATCH}" "${GREP_SKIP_MATCH}"; do
stestr last --subunit | subunit2pyunit 2>&1 | \
grep "${match}"
done
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ basepython = python2.7
deps = tox
commands = -mkdir {envdir}/src
-rm -r {envdir}/src/*
bash -c "curl https://tarballs.openstack.org/nova/nova-master.tar.gz | tar -C {envdir}/src -zxv --strip-components 1 -f - "
bash -c "curl https://tarballs.openstack.org/nova/nova-master.tar.gz | tar -C {envdir}/src -zx --strip-components 1 -f - "
tox -c {envdir}/src -e functional --notest # ensure a virtualenv is built
{envdir}/src/.tox/functional/bin/pip install -U {toxinidir} # install gabbi
# nova shares tox envs so it's just luck that we know the tox dir is different from name
{envdir}/src/.tox/py27/bin/pip install -U {toxinidir} # install gabbi
tox -c {envdir}/src -e functional test_placement_api
whitelist_externals =
mkdir
Expand Down

0 comments on commit ede7cb7

Please sign in to comment.