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: Duplicate names in tree_namespace #128

Merged
merged 4 commits into from
May 24, 2018
Merged

Conversation

ZLLentz
Copy link
Member

@ZLLentz ZLLentz commented May 23, 2018

Description

If we're constructing the tree namespace and we encounter a leaf that already exists, we need to handle it properly. Currently it can fail and break the tree. This makes it show a warning message about two devices having a naming conflict.

Motivation and Context

xcspython load has a conflict between xcs_lodcm and xcs_lodcm_yag

How Has This Been Tested?

I have added a test.

@codecov-io
Copy link

codecov-io commented May 23, 2018

Codecov Report

Merging #128 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #128      +/-   ##
==========================================
+ Coverage   97.17%   97.18%   +<.01%     
==========================================
  Files          15       15              
  Lines         779      781       +2     
==========================================
+ Hits          757      759       +2     
  Misses         22       22
Impacted Files Coverage Δ
hutch_python/namespace.py 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update de702a5...14afcd0. Read the comment docs.

@ZLLentz
Copy link
Member Author

ZLLentz commented May 23, 2018

@teddyrendahl thoughts on if this should fail silently or noisily?

@ZLLentz ZLLentz changed the title WIP: Duplicate names in tree_namespace FIX: Duplicate names in tree_namespace May 23, 2018
@ZLLentz
Copy link
Member Author

ZLLentz commented May 23, 2018

I have opted to make this a WARNING message about two devices having a naming conflict. You can proceed into a session as normal, but I don't make any guarantees about the tree namespace being well-formed if there is a naming conflict.

@ZLLentz ZLLentz merged commit a59158a into pcdshub:master May 24, 2018
@ZLLentz ZLLentz deleted the fix-ns branch October 17, 2018 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants