Merge ~peter-sabaini/charm-sudo-pair:fix-tests into ~sudo-pair-charmers/charm-sudo-pair:master

Proposed by Peter Sabaini
Status: Merged
Merged at revision: ec1f92d37b9de13db69db5e5066e162d527a9c36
Proposed branch: ~peter-sabaini/charm-sudo-pair:fix-tests
Merge into: ~sudo-pair-charmers/charm-sudo-pair:master
Diff against target: 24 lines (+2/-2)
2 files modified
tests/functional/requirements.txt (+1/-1)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Diko Parvanov Approve
Review via email: mp+374024@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Diko Parvanov (dparv) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index 6c6cdc6..b9815c2 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1,6 +1,6 @@
1juju1juju
2requests2requests
3pytest==4.0.23pytest
4pytest-asyncio4pytest-asyncio
5mock5mock
6flake86flake8
diff --git a/tox.ini b/tox.ini
index 7d3565b..562d0ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist = unit, functional, func_xenial
4skip_missing_interpreters = True4skip_missing_interpreters = True
55
6[testenv]6[testenv]
7basepython = python3.67basepython = python3
8setenv =8setenv =
9 PYTHONPATH = .9 PYTHONPATH = .
1010

Subscribers

People subscribed via source and target branches