1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/1da0c76f4000/ changeset: 1da0c76f4000 user: natefoo date: 2011-12-09 15:40:40 summary: Fix unit test broken by object store. affected #: 2 files

diff -r 3ccece0dbc02812da682481bf1196d69bcc38d67 -r 1da0c76f4000d6627d6ce66a7de55a6b80753661 lib/galaxy/model/mapping_tests.py --- a/lib/galaxy/model/mapping_tests.py +++ b/lib/galaxy/model/mapping_tests.py @@ -36,8 +36,9 @@ assert hists[0].user == users[0] assert hists[1].user is None assert hists[1].datasets[0].metadata.chromCol == 1 - id = hists[1].datasets[0].id - assert hists[1].datasets[0].file_name == os.path.join( "/tmp", *directory_hash_id( id ) ) + ( "/dataset_%d.dat" % id ) + # The filename test has moved to objecstore + #id = hists[1].datasets[0].id + #assert hists[1].datasets[0].file_name == os.path.join( "/tmp", *directory_hash_id( id ) ) + ( "/dataset_%d.dat" % id ) # Do an update and check hists[1].name = "History 2b" model.session.flush()

diff -r 3ccece0dbc02812da682481bf1196d69bcc38d67 -r 1da0c76f4000d6627d6ce66a7de55a6b80753661 lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -200,6 +200,15 @@ """ Standard Galaxy object store, stores objects in files under a specific directory on disk. + + >>> from galaxy.util.bunch import Bunch + >>> import tempfile + >>> file_path=tempfile.mkdtemp() + >>> s = DiskObjectStore(Bunch(umask=077), file_path=file_path) + >>> s.create(1) + >>> s.exists(1) + True + >>> assert s.get_filename(1) == file_path + '/000/dataset_1.dat' """ def __init__(self, config, file_path=None, extra_dirs=None): super(DiskObjectStore, self).__init__()

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.