Skip to content
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.

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

Fix libcloud bug #33367 #33518

Merged
merged 13 commits into from
May 29, 2016
Merged

Fix libcloud bug #33367 #33518

merged 13 commits into from
May 29, 2016

Conversation

tonybaloney
Copy link
Contributor

What does this PR do?

Addresses the issue highlighted in #33367

What issues does this PR fix or reference?

#33367

Previous Behavior

libcloudfuncs do not support strings

New Behavior

libcloudfuncs will support node state as either a string or an integer

Tests written?

Yes

@tonybaloney
Copy link
Contributor Author

Just committed a test for now to prove that this is currently broken. Then I'll fix the code and (hopefully) the test should pass

@tonybaloney
Copy link
Contributor Author

CC @supertom

@cachedout
Copy link
Contributor

@techhat Could you take a look please?

@tonybaloney
Copy link
Contributor Author

build error "Traceback (most recent call last):
File "/usr/lib64/python2.7/site-packages/tornado/testing.py", line 119, in call
result = self.orig_method(_args, *_kwargs)
File "/testing/tests/integration/netapi/rest_tornado/test_app.py", line 371, in test_get_no_mid
self.assertEqual(len(response_obj['return'][0]), 2)
AssertionError: 1 != 2"
pretty sure that wasn't me

@techhat
Copy link
Contributor

techhat commented May 29, 2016

@cachedout, LGTM.

@cachedout cachedout merged commit 055c9bd into saltstack:develop May 29, 2016
@supertom
Copy link
Contributor

Thanks @tonybaloney for the fix!

@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Aug 4, 2016
@meggiebot
Copy link

Need in 2016.3

@tonybaloney
Copy link
Contributor Author

You read my mind. I saw the release notes yesterday and realised this fix wasn't in there. +1.

@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Aug 5, 2016
@rallytime
Copy link
Contributor

Done in #35235

cachedout pushed a commit that referenced this pull request Aug 6, 2016
cachedout pushed a commit that referenced this pull request Aug 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants