summaryrefslogtreecommitdiff
diff options
authorPeter Sabaini <peter.sabaini@canonical.com>2020-04-16 09:43:43 +0200
committerPeter Sabaini <peter.sabaini@canonical.com>2020-04-16 09:43:43 +0200
commitd39567042500595199b43817df89ace3c1f393f5 (patch)
treef1821553fac41b5d16366bed34817a0587775411
parentb8435c56af49deead8f87151b68991e498051f39 (diff)
Address review comments
Also remove some leftover
-rw-r--r--Makefile2
-rw-r--r--tests/test_requirements.txt2
-rw-r--r--tests/tests_mongodb.py5
-rw-r--r--tox.ini8
4 files changed, 5 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 68db95f..8e20153 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ unit:
functional:
@echo Starting functional tests...
- rm -rf .venv
+ rm -rf .venv # rm the python2 venv from unittests as it fails the juju deploy
@tox -e functional
sync:
diff --git a/tests/test_requirements.txt b/tests/test_requirements.txt
new file mode 100644
index 0000000..9fbeeab
--- /dev/null
+++ b/tests/test_requirements.txt
@@ -0,0 +1,2 @@
+git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+pymongo
diff --git a/tests/tests_mongodb.py b/tests/tests_mongodb.py
index 2e763d7..dc50d8d 100644
--- a/tests/tests_mongodb.py
+++ b/tests/tests_mongodb.py
@@ -53,11 +53,6 @@ class MongodbCharmTestBase(unittest.TestCase):
cls.leader_address = addr
cls.db_client = MongoClient(cls.leader_address)
- @classmethod
- def tearDownClass(cls):
- # shutil.rmtree(cls.tmp)
- pass
-
def cat_unit(self, unit, path):
unit_res = model.run_on_unit(unit, "sudo cat {}".format(path))
return unit_res["Stdout"]
diff --git a/tox.ini b/tox.ini
index 013abf0..6e3a650 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,14 +21,10 @@ deps = -r{toxinidir}/test_requirements.txt
basepython = python3
commands =
functest-run-suite --keep-model
-deps =
- git+https://github.com/openstack-charmers/zaza.git#egg=zaza
- pymongo
+deps = -r{toxinidir}/tests/test_requirements.txt
[testenv:func-smoke]
basepython = python3
commands =
functest-run-suite --keep-model --smoke
-deps =
- git+https://github.com/openstack-charmers/zaza.git#egg=zaza
- pymongo
+deps = -r{toxinidir}/tests/test_requirements.txt