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

don't write repo cfg yaml file #11

Merged
merged 1 commit into from
Mar 9, 2016
Merged

don't write repo cfg yaml file #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions python/lsst/daf/persistence/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@ def __init__(self, cfg):

self._id = cfg['id']

if cfg['accessCfg.storageCfg.root'] is not None:
self._access.setCfg(cfg)

self._initMapper(cfg)


Expand Down
13 changes: 5 additions & 8 deletions tests/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,16 +262,13 @@ def testCreateAggregateAndLoadingAChild(self):

# create butlers where the output repos are now input repos

repoCfg = dp.Repository.cfg(id='repoC',
accessCfg=dp.Access.cfg(storageCfg=dp.PosixStorage.cfg(root='tests/repository/repoC')),
parentCfgs=[dp.Access(dp.Access.cfg(storageCfg=dp.PosixStorage.cfg('tests/repository/repoA'))).loadCfg()],
mapper=MapperForTestWriting(root='tests/repository/repoC'))
# currently must pass a mapper to the repo cfg, even though we are not going to write to this repo
# (only read from parent repos). So it's ok to set root to an empty path, it will just treat the
# current dir as root, and we won't write to it.
repoCfg = dp.Repository.cfg(parentCfgs=(repoACfg,), mapper=MapperForTestWriting(root=''))
butlerC = dp.Butler(dp.Butler.cfg(repoCfg=repoCfg))

repoCfg = dp.Repository.cfg(id='repoD',
accessCfg=dp.Access.cfg(storageCfg=dp.PosixStorage.cfg('tests/repository/repoD')),
parentCfgs=[dp.Access(dp.Access.cfg(storageCfg=dp.PosixStorage.cfg('tests/repository/repoB'))).loadCfg()],
mapper=MapperForTestWriting(root='tests/repository/repoD'))
repoCfg = dp.Repository.cfg(parentCfgs=(repoBCfg,), mapper=MapperForTestWriting(root=''))
butlerD = dp.Butler(dp.Butler.cfg(repoCfg=repoCfg))

# # verify the objects exist by getting them
Expand Down