summaryrefslogtreecommitdiff
diff options
authorMario Splivalo <mario.splivalo@canonical.com>2017-03-21 11:56:27 +0100
committerMario Splivalo <mario.splivalo@canonical.com>2017-03-21 18:17:38 +0100
commitc8d04beee363ecf1bc6505fbda79cb9230031d34 (patch)
tree06f991655c8a078ab2ddd42107443446a3417513
parent82c9f427f8a030cc4180919c6e1b54878f5e94bc (diff)
Added dependencies for unit tessting
Dependencies for unit testing for trusty and xenial have been added; also, removed obsolete dependencies for FileLock.
-rw-r--r--.gitignore10
-rwxr-xr-xhooks/hooks.py6
-rw-r--r--test_requirements.txt4
3 files changed, 13 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a936365
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+.git
+.project
+.pydevproject
+.coverage
+.settings
+*.pyc
+.venv/
+bin/*
+scripts/charm-helpers-sync.py
+exec.d/*
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 731444d..aa09ff5 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -83,12 +83,6 @@ except ImportError:
from pymongo import MongoClient as Connection
from pymongo.errors import OperationFailure
-try:
- from lockfile import FileLock
-except ImportError:
- apt_install("python-lockfile", fatal=True)
- from lockfile import FileLock
-
from charmhelpers.contrib.charmsupport.nrpe import NRPE
hooks = Hooks()
diff --git a/test_requirements.txt b/test_requirements.txt
index f85377f..aaa5368 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -2,5 +2,7 @@ coverage>=3.6
mock>=1.0.1
nose>=1.3.1
flake8
-filelock
charm-tools
+packaging
+appdirs
+pymongo