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.

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

Jump to bottom

Fix #86: Support multiple auth tokens #92

Merged
merged 6 commits into from
Aug 2, 2016
Merged

Fix #86: Support multiple auth tokens #92

merged 6 commits into from
Aug 2, 2016

Conversation

mwarkentin
Copy link
Owner

@mwarkentin mwarkentin commented Jul 31, 2016 •
edited
Loading

  • Add deprecation warning
  • Update logic to handle both WATCHMAN_TOKEN and WATCHMAN_TOKENS
  • Deprecate WATCHMAN_TOKEN
  • Update readme
  • Add tests for single / multiple tokens

@mwarkentin
Initial take
e42e915 
* Add deprecation warning
* Update logic to handle both `WATCHMAN_TOKEN` and `WATCHMAN_TOKENS`
@coveralls
Copy link

coveralls commented Jul 31, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.04%) to 86.364% when pulling e42e915 on 86-multiple-auth-tokens into f60654a on master.

@mwarkentin
Add tests for multi-token support
407dd45 
* Restructure test classes
* Add both valid and invalid token tests
@coveralls
Copy link

coveralls commented Jul 31, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.4%) to 86.742% when pulling 407dd45 on 86-multiple-auth-tokens into f60654a on master.

@coveralls
Copy link

coveralls commented Aug 2, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.6%) to 86.891% when pulling 6ee5d60 on 86-multiple-auth-tokens into f60654a on master.

@coveralls
Copy link

coveralls commented Aug 2, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.6%) to 86.891% when pulling 1e143eb on 86-multiple-auth-tokens into f60654a on master.

@coveralls
Copy link

coveralls commented Aug 2, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.6%) to 86.891% when pulling 1e143eb on 86-multiple-auth-tokens into f60654a on master.

nduthoit
nduthoit reviewed Aug 2, 2016
View reviewed changes
watchman/decorators.py
else:
watchman_tokens = []

if not watchman_tokens:
Copy link

Choose a reason for hiding this comment

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

why not set watchman_tokens = None in line 74 and check if watchman_tokens is None?

@coveralls
Copy link

coveralls commented Aug 2, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.6%) to 86.891% when pulling accb472 on 86-multiple-auth-tokens into f60654a on master.

nduthoit
nduthoit reviewed Aug 2, 2016
View reviewed changes
watchman/decorators.py
elif settings.WATCHMAN_TOKEN:
watchman_tokens = [settings.WATCHMAN_TOKEN, ]
else:
watchman_tokens = None
Copy link

Choose a reason for hiding this comment

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

Actually, can just return True here

Copy link
Owner Author

Choose a reason for hiding this comment

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

Good call.. thanks. 💃

@nduthoit
Copy link

nduthoit commented Aug 2, 2016

LGTM 💯

@coveralls
Copy link

coveralls commented Aug 2, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.4%) to 86.742% when pulling dfd2264 on 86-multiple-auth-tokens into f60654a on master.

@mwarkentin mwarkentin merged commit 337325f into master Aug 2, 2016
@mwarkentin mwarkentin deleted the 86-multiple-auth-tokens branch August 2, 2016 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mwarkentin @coveralls @nduthoit