Skip to content

Commit

Permalink
Merge pull request #64 from mattsb42-aws/fix-tests
Browse files Browse the repository at this point in the history
Fix tests
  • Loading branch information
mattsb42-aws committed Aug 15, 2018
2 parents c7061a0 + fbf9b4a commit 98ad67b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test_vector_generator/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ envlist =
# release :: Builds dist files and uploads to pypi pypirc profile.

[testenv:base-command]
commands = pytest --basetemp={envtmpdir} -l --cov awses_test_vectors {posargs}
commands = pytest --basetemp={envtmpdir} -l --cov awses_test_vectors test/ {posargs}

[testenv]
passenv =
Expand Down
14 changes: 7 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ passenv =
sitepackages = False
deps = -rtest/requirements.txt
commands =
local: {[testenv:base-command]commands} -m local
integ: {[testenv:base-command]commands} -m integ
accept: {[testenv:base-command]commands} -m accept
all: {[testenv:base-command]commands}
examples: {[testenv:base-command]commands} -m examples
local: {[testenv:base-command]commands} test/ -m local
integ: {[testenv:base-command]commands} test/ -m integ
accept: {[testenv:base-command]commands} test/ -m accept
examples: {[testenv:base-command]commands} examples/test/ -m examples
all: {[testenv:base-command]commands} test/ examples/test/

# Verify that local tests work without environment variables present
[testenv:nocmk]
basepython = python3
sitepackages = False
deps = -rtest/requirements.txt
commands = {[testenv:base-command]commands} -m local
commands = {[testenv:base-command]commands} test/ -m local

# Linters
[testenv:flake8]
Expand Down Expand Up @@ -134,7 +134,7 @@ commands = python setup.py check -r -s
basepython = python3
deps =
# Pull bandit from github because they haven't published 1.4.1 to pypi yet
git+git://github.com/openstack/bandit.git@master
git+git://github.com/PyCQA/bandit.git@master
commands = bandit -r src/aws_encryption_sdk/

# Prone to false positives: only run independently
Expand Down

0 comments on commit 98ad67b

Please sign in to comment.