Merge ~mariosplivalo/charm-mongodb:master into ~mongodb-charmers/charm-mongodb:master

Proposed by Mario Splivalo
Status: Merged
Merged at revision: ae8f69cbcaa1598a0374722a9ab99eb29903840f
Proposed branch: ~mariosplivalo/charm-mongodb:master
Merge into: ~mongodb-charmers/charm-mongodb:master
Diff against target: 46 lines (+13/-7)
3 files modified
.gitignore (+10/-0)
hooks/hooks.py (+0/-6)
test_requirements.txt (+3/-1)
Reviewer Review Type Date Requested Status
Mario Splivalo (community) Approve
Jorge Niedbalski (community) Approve
Felipe Reyes (community) Approve
Review via email: mp+320482@code.launchpad.net

Description of the change

Fix unit_test dependencies for bundletester (for review.jujucharms.com)

To post a comment you must log in.
Revision history for this message
Felipe Reyes (freyes) wrote :

LGTM

after a quick chat with Mario, it was pointed out that the removal of lockfile module is because it was leftover from code that was already removed

review: Approve
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

lint/tests passing, code crush OK :)

LGTM

review: Approve
Revision history for this message
Mario Splivalo (mariosplivalo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2new file mode 100644
3index 0000000..a936365
4--- /dev/null
5+++ b/.gitignore
6@@ -0,0 +1,10 @@
7+.git
8+.project
9+.pydevproject
10+.coverage
11+.settings
12+*.pyc
13+.venv/
14+bin/*
15+scripts/charm-helpers-sync.py
16+exec.d/*
17diff --git a/hooks/hooks.py b/hooks/hooks.py
18index 731444d..aa09ff5 100755
19--- a/hooks/hooks.py
20+++ b/hooks/hooks.py
21@@ -83,12 +83,6 @@ except ImportError:
22 from pymongo import MongoClient as Connection
23 from pymongo.errors import OperationFailure
24
25-try:
26- from lockfile import FileLock
27-except ImportError:
28- apt_install("python-lockfile", fatal=True)
29- from lockfile import FileLock
30-
31 from charmhelpers.contrib.charmsupport.nrpe import NRPE
32
33 hooks = Hooks()
34diff --git a/test_requirements.txt b/test_requirements.txt
35index f85377f..aaa5368 100644
36--- a/test_requirements.txt
37+++ b/test_requirements.txt
38@@ -2,5 +2,7 @@ coverage>=3.6
39 mock>=1.0.1
40 nose>=1.3.1
41 flake8
42-filelock
43 charm-tools
44+packaging
45+appdirs
46+pymongo

Subscribers

People subscribed via source and target branches

to status/vote changes: