openstack/watcher
Code Issues Proposed changes

fix dependencies version

Browse Source 
Change-Id: I5fc4b3e8193232379a6aa2b6cc4ef6457f0a6ef1
This commit is contained in:
Jean-Emile DARTOIS 2015-10-22 16:25:59 +02:00
parent 38d7fcdc68
commit 77fcefbfbb
6 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.coveragerc
View File

@ -4,4 +4,4 @@ source = watcher
omit = watcher/tests/*,watcher/openstack/* omit = watcher/tests/*,watcher/openstack/*
[report] [report]
ignore-errors = True ignore_errors = True

2
.gitreview
View File

@ -1,4 +1,4 @@
[gerrit] [gerrit]
host=review.openstack.org host=review.openstack.org
port=29418 port=29418
project=stackforge/watcher.git project=openstack/watcher.git

29
requirements.txt
View File

@ -3,13 +3,13 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=0.6,!=0.7,<1.0 pbr>=0.6,!=0.7,<1.0
oslo.config>=1.4.0 oslo.config==1.14.0
PasteDeploy==1.5.2 PasteDeploy==1.5.2
oslo.messaging oslo.messaging==1.16.0
oslo.db oslo.db==2.1.0
oslo.log oslo.log==1.6.0
oslo.i18n oslo.i18n==2.1.0
oslo.utils>=1.2.0 # Apache-2.0 oslo.utils==1.8.0 # Apache-2.0
pecan>=0.8 pecan>=0.8
keystonemiddleware>=1.0.0 keystonemiddleware>=1.0.0
six>=1.7.0,<=1.9.0 six>=1.7.0,<=1.9.0
@ -20,10 +20,13 @@ jsonpatch>=1.1
enum34==1.0.4 enum34==1.0.4
# watcher Applier # watcher Applier
python-novaclient python-novaclient==2.28.1
python-openstackclient python-openstackclient==1.6.0
python-neutronclient python-neutronclient==3.0.0
python-glanceclient python-glanceclient==1.1.0
python-cinderclient python-cinderclient==1.4.0
# Decision Engine
python-ceilometerclient # Collector
python-ceilometerclient==1.5.0
influxdb==2.9.1
parsedatetime==1.5

11
test-requirements.txt
View File

@ -6,13 +6,16 @@ hacking<0.11,>=0.10.0
coverage>=3.6 coverage>=3.6
discover discover
python-subunit>=0.0.18 python-subunit>=0.0.18
oslotest>=1.2.0 # Apache-2.0 oslotest==1.8.0 # Apache-2.0
testrepository>=0.0.18 testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=0.9.36,!=1.2.0 testtools==1.7.1
mock>=1.0 mock==1.3.0
# Doc requirements # Doc requirements
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.2.0 # Apache-2.0 oslosphinx==3.0.0 # Apache-2.0
sphinxcontrib-pecanwsme>=0.8 sphinxcontrib-pecanwsme>=0.8
# For PyPI distribution
twine

2
watcher/tests/api/v1/test_audits.py
View File

@ -33,7 +33,7 @@ from watcher.tests.objects import utils as obj_utils
def post_get_test_audit(**kw): def post_get_test_audit(**kw):
audit = api_utils.audit_post_data(**kw) audit = api_utils.audit_post_data(**kw)
audit_template = db_utils.get_test_audit_template() audit_template = db_utils.get_test_audit_template()
audit['audit_template_id'] = None del audit['audit_template_id']
audit['audit_template_uuid'] = kw.get('audit_template_uuid', audit['audit_template_uuid'] = kw.get('audit_template_uuid',
audit_template['uuid']) audit_template['uuid'])
return audit return audit

6
watcher/tests/common/messaging/event/test_event_dispatcher.py
View File

@ -59,7 +59,7 @@ class TestEventDispatcher(base.TestCase):
listener) listener)
self.event_dispatcher.dispatch_event(event) self.event_dispatcher.dispatch_event(event)
listener.assert_has_calls(call(event)) listener.assert_has_calls(calls=[call(event)])
def test_dispatch_event_to_all_listener(self): def test_dispatch_event_to_all_listener(self):
event = self.fake_event(Events.ACTION_PLAN) event = self.fake_event(Events.ACTION_PLAN)
@ -75,6 +75,6 @@ class TestEventDispatcher(base.TestCase):
listener_trigger_audit) listener_trigger_audit)
self.event_dispatcher.dispatch_event(event) self.event_dispatcher.dispatch_event(event)
listener_all.assert_has_calls(call(event)) listener_all.assert_has_calls(calls=[call(event)])
listener_action_plan.assert_has_calls(call(event)) listener_action_plan.assert_has_calls(calls=[call(event)])
listener_trigger_audit.assert_has_calls([]) listener_trigger_audit.assert_has_calls([])