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

resolving conflicts for pull request #631 #636

Merged
merged 5 commits into from
Dec 14, 2016
Merged

resolving conflicts for pull request #631 #636

merged 5 commits into from
Dec 14, 2016

Conversation

vnitinv
Copy link
Contributor

@vnitinv vnitinv commented Dec 14, 2016

Fix #631

stacywsmith and others added 5 commits December 5, 2016 07:54
@stacywsmith
Improve error handling in directory_usage():
553e059 
 - Raise an RpcError if no <directory> element present in the response.
 - Raise an RpcError (rather than trying to perform None.strip()) if a
   <directory-name> element is missing.
@stacywsmith
Correcting syntax error in for loop.
cd6aa35
@stacywsmith
Adding unit tests for directory_usage() error conditions.
14f6ecf
@stacywsmith
Correcting an issue which was uncovered by unit test.
eb48f95 
findall() returns [] not None when no matching element found.
@vnitinv
resolving conflicts for pull request Juniper#631
e691130
@coveralls
Copy link

coveralls commented Dec 14, 2016 •
edited

Coverage Status

Coverage increased (+0.005%) to 95.928% when pulling e691130 on vnitinv:master into ecb0116 on Juniper:master.

@vnitinv vnitinv merged commit 63907bb into Juniper:master Dec 14, 2016
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.

None yet
3 participants
@vnitinv @coveralls @stacywsmith