Skip to content

Revert mongoengine dependency upgrade #3402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arm4b merged 4 commits into from
May 10, 2017
Merged

Revert mongoengine dependency upgrade #3402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
affcbbe
Revert "Upgrade dependencies"
armab May 10, 2017
31c6065
Undo revert for mongoengine
Mierdin May 10, 2017
d05ccf4
Re-applied changes except for mongoengine
May 10, 2017
fa32075
Reverted to old version of mongoengine in requirements.txt
May 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fixed-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ requests[security]>=2.13.0,<2.14
apscheduler==3.3.1
gitpython==2.1.3
jsonschema>=2.5.0,<2.6
mongoengine==0.13.0
mongoengine==0.11.0
pymongo==3.4.0
passlib==1.6.5
lockfile>=0.10.2,<0.11
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jsonschema<2.6,>=2.5.0
kombu==3.0.37
lockfile<0.11,>=0.10.2
mock
mongoengine==0.13.0
mongoengine==0.11.0
networkx==1.10
nose
oslo.config<1.13,>=1.12.1
Expand Down
6 changes: 3 additions & 3 deletions st2actions/tests/unit/policies/test_concurrency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def test_on_cancellation(self):
# Since states are being processed asynchronously, wait for the
# liveactions to go into scheduled states.
for i in range(0, 100):
eventlet.sleep(2)
Copy link
Member

@Kami Kami May 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually one because concurrency tests were failing, but if they are not failing anymore, it's fine.

That failure was probably related to Circle CI since it was failing on master as well, before any other stuff was merged.

eventlet.sleep(1)
scheduled = [item for item in LiveAction.get_all() if item.status in SCHEDULED_STATES]
if len(scheduled) == policy_db.parameters['threshold']:
break
Expand All @@ -272,7 +272,7 @@ def test_on_cancellation(self):
# Since states are being processed asynchronously, wait for the
# liveaction to go into delayed state.
for i in range(0, 100):
eventlet.sleep(2)
eventlet.sleep(1)
liveaction = LiveAction.get_by_id(str(liveaction.id))
if liveaction.status == action_constants.LIVEACTION_STATUS_DELAYED:
break
Expand All @@ -291,7 +291,7 @@ def test_on_cancellation(self):
# Since states are being processed asynchronously, wait for the
# liveaction to go into scheduled state.
for i in range(0, 100):
eventlet.sleep(2)
eventlet.sleep(1)
liveaction = LiveAction.get_by_id(str(liveaction.id))
if liveaction.status in SCHEDULED_STATES:
break
Expand Down