openstack/deb-mistral
Code Issues Proposed changes

Merge "Update requirements due to global-requirements"

Browse Source
This commit is contained in:
Jenkins 2014-07-07 09:18:05 +00:00 committed by Gerrit Code Review
commit bb0cf897f4
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mistral/engine/drivers/default/executor.py
View File

@ -48,7 +48,7 @@ class DefaultExecutor(executor.Executor):
action = a_f.create_action(task) action = a_f.create_action(task)
#TODO(dzimine): on failure, convey failure details back # TODO(dzimine): on failure, convey failure details back
if action.is_sync(): if action.is_sync():
try: try:
@ -73,8 +73,9 @@ class DefaultExecutor(executor.Executor):
:param exception: an exception thrown during the execution of the task :param exception: an exception thrown during the execution of the task
:type exception: Exception :type exception: Exception
""" """
#TODO(dzimine): why exception is a parameter here? # TODO(dzimine): why exception is a parameter here?
#TODO(dzimine): convey exception details to end user (why task failed?) # TODO(dzimine): convey exception details to end user
# (why task failed?)
try: try:
db_api.start_tx() db_api.start_tx()
try: try:

4
mistral/tests/unit/actions/test_action_factory.py
View File

@ -222,8 +222,8 @@ class ActionFactoryTest(base.BaseTest):
'project_id': '321' 'project_id': '321'
} }
}) })
## In case of no-adhoc action we should evaluate task parameters # In case of no-adhoc action we should evaluate task parameters
## to see what we need. # to see what we need.
task_spec = db_task['task_spec'] task_spec = db_task['task_spec']
task_spec['parameters'] = { task_spec['parameters'] = {
'url': "http://some/{$.openstack.project_id}/servers", 'url': "http://some/{$.openstack.project_id}/servers",

10
requirements.txt
View File

@ -11,13 +11,13 @@ posix_ipc
croniter>=0.3.4 # MIT License croniter>=0.3.4 # MIT License
requests>=1.1 requests>=1.1
kombu>=2.4.8 kombu>=2.4.8
oslo.config>=1.2.0 oslo.config>=1.2.1
oslo.messaging>=1.3.0 oslo.messaging>=1.3.0
oslotest oslotest
paramiko>=1.9.0 paramiko>=1.13.0
python-keystoneclient>=0.7.0 python-keystoneclient>=0.9.0
networkx>=1.8 networkx>=1.8
six>=1.6.0 six>=1.7.0
SQLAlchemy>=0.7.8,<=0.9.99 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
stevedore>=0.14 stevedore>=0.14
yaql==0.2.1 # This is not in global requirements yaql==0.2.1 # This is not in global requirements

10
test-requirements.txt
View File

@ -1,10 +1,8 @@
hacking>=0.8.0,<0.9 hacking>=0.9.2,<0.10
coverage>=3.6 coverage>=3.6
pep8==1.4.5 pyflakes==0.8.1
pyflakes>=0.7.2,<0.7.4
flake8==2.0
pylint==0.25.2 pylint==0.25.2
sphinx>=1.1.2 sphinx>=1.1.2,!=1.2.0,<1.3
unittest2 unittest2
oslosphinx oslosphinx
sphinxcontrib-pecanwsme>=0.8 sphinxcontrib-pecanwsme>=0.8
@ -15,4 +13,4 @@ mock>=1.0
nose nose
testrepository>=0.0.18 testrepository>=0.0.18
testtools>=0.9.34 testtools>=0.9.34
lockfile>=0.9.1 lockfile>=0.8