Commit Graph
11600 Commits
Author SHA1 Message Date
Dave Bouvier 048e4af5d7 Use walltime configured in job_conf.xml instead of maxseconds for determining whether a test tool run is stuck. 2013-12-05 13:52:22 -05:00
Carl Eberhard 2752c5c10b Dataset, purge and purge async: allow non-deleted datasets to be purged (setting delete in the process) 2013-12-05 13:42:05 -05:00
Carl Eberhard ba567e9751 History panel: remove href and target from disabled buttons 2013-12-05 13:32:05 -05:00
Carl Eberhard c92616685e HDA API: raise error when attempting to undelete purged HDA 2013-12-05 13:27:01 -05:00
Carl Eberhard ced6f40287 Popupmenus: correctly assign default button div 2013-12-05 13:19:37 -05:00
John Chilton c8b32ba00d Merge latest central. 2013-12-05 11:02:57 -06:00
John Chilton 19b6904b98 More fixes to install_and_test_tool_shed_repositories for session globals going away. 2013-12-05 11:02:01 -06:00
Greg Von Kuster 8aa3adf55f Improved exception handling in the Tool Shed's container_util. 2013-12-05 11:10:20 -05:00
John Chilton 54f8c657b5 Rework search.py to reflect galaxy.model can be imported and not mapped.
Basically search.py was assuming certain class attributes are available that are not available until after mapping.init has done its thing. This delays evaluation of those class attributes until runtime.
2013-12-05 00:20:54 -06:00
John Chilton 17ea9df5d7 PEP-8 fixes for search.py. 2013-12-05 00:20:54 -06:00
John Chilton e2f886162d Fixup to error handling in repository_util.py 2013-12-05 00:20:54 -06:00
John Chilton 42dc433376 Models: Allow setting install database target when running tool shed functional tests. 2013-12-05 00:20:54 -06:00
John Chilton 6d37b2890c Models: Database migrations for stand-alone tool_shed_install models.
create_db and manage_db should now work with install as well.

Migrations are symbolic links into lib/galaxy/model/migrate/versions of migrations affecting these tables. All future migrations to these tables should created in one place like this and linked in the other.
2013-12-05 00:20:54 -06:00
John Chilton 4b8f26f450 Models: Allow core Galaxy models and install tool dependencies to target different databases.
Now app.model and app.install_model may be two distinct objects not just two references to the same object. Add ModelMapping class for galaxy.model.tool_shed_install.

If install_database_connection is set in Galaxy configuration, a separate database will be targetted for the persistence of the tool shed repository information. Additional database options may likewise be specified in this case: install_database_engine_option_pool_size, etc....
2013-12-05 00:20:54 -06:00
John Chilton 5984bbe10c Models: Introduce app.install_model.
All references to galaxy.model.tool_shed_install models should go through this instance. Right now it is a reference to the same ModelMapping instance, but the goal is to allow them to be two different mappings.
2013-12-05 00:20:54 -06:00
John Chilton 1988b117cb Models: Update references galaxy.model.ToolShedRepository.
Replace references to galaxy.model.Tool{ShedRepository,Dependency} with new galaxy.model.tool_shed_install path.
2013-12-05 00:20:54 -06:00
John Chilton 0e0d6fb279 Models: Move tool shed install related models and mapping into own package.
Specifically, refactor all tool shed installation related models and mapping information in Galaxy's models into new module galaxy.model.tool_shed_install.

This is work toward being able to store tool shed installation data into a second database. There is still a lot TODO, all access to these models are still through galaxy.model and the existing ModelMapping object, these references need to be refactored.

More information on the end goal here: http://dev.list.galaxyproject.org/Galaxy-less-Tool-Installing-tp4660655.html.
2013-12-05 00:20:54 -06:00
John Chilton 77a9bb5db2 Models: Unify 'now' import and comment across galaxy and toolshed. 2013-12-05 00:20:54 -06:00
John Chilton 9faa65a66e Models: Random fixes for mapping tests.
PEP-8. Get rid of old test suite code mixed into real code.
2013-12-05 00:20:54 -06:00
John Chilton 79c8f59341 Models: Introduce real class for app.model (ModelMapping).
Shared across Tool Shed and Galaxy to reduce code duplication. Previously this was just a bunch, making it a real class allows placing some shared logic in there.

This refactoring also eliminates some global variables galaxy.model.mapping.Session, galaxy.model.mapping.context, and same for tool shed. This may break things, but these are things that should probably be fixed anyway.

In particular small changes to db_shell.py and a unit test that depended on these global variables have been updated. The functional test frameworks likewise needed to be updated to not depend on these - these changes were more substantial.

To fix these functional tests, I essentially replace old references to global variables in Galaxy with references to global variables just defined in the test framework in test/functional/database_contexts.py (a slight improvement).
2013-12-05 00:20:54 -06:00
John Chilton 4dc6c93a9f Models: Refactor common code out between Galaxy and Tool Shed related to create_engine. 2013-12-05 00:20:54 -06:00
John Chilton e7d8b36513 Models: Refactor some common code between tool shed and Galaxy into galaxy.model.orm. 2013-12-05 00:20:54 -06:00
John Chilton b686182e13 Modles: Clean up stand-alone database scripts.
Namely create_db.py,db_shell.py, and manage_db.py.

Move duplicated code into lib/galaxy/model/orm/scripts.py - add unit tests. PEP-8 clean up of all 4 files. Add incoherent incoherent comment at top of manage_db.py.

As a result of the code de-duplication create_db.py should be usable with the tool shed now.

Will be refactoring lib/galaxy/model/orm/scripts.py to work with new tool shed install database - it will be good to have a place to test these and allow manage_db.py and clean_db.py to work immediately.
2013-12-05 00:20:54 -06:00
John Chilton 962a53e544 Allow run_unit_tests.sh to execute all unit tests in test/unit.
Basically adds __init__.py files to each subdirectory so nose detects these as Python module directories. Also modify dynamic loading of modules in Carl's test cases so the test case can be run with any cwd - including the Galaxy root directory as run_unit_tests.sh will use.

This should roughly double the number of unit tests buildbot runs.
2013-12-04 11:46:32 -06:00
John Chilton f6f2d64a8a Load plugins in a deterministic order.
Fixes plugin unit tests on my dev box and is a good idea overall anyway.
2013-12-04 11:42:43 -06:00
Aysam Guerler edd8892a4a UI: Fix iconbar css 2013-12-05 00:05:20 -05:00
Aysam Guerler 894ec4a475 Grids: Fix tag click event 2013-12-04 19:59:07 -05:00
Aysam Guerler 250dd672bd Grids: Refactoring and fixes
iG: removed templates/grid_common.mako
2013-12-04 18:51:44 -05:00
Greg Von Kuster 6d55496418 Fixes for rendering tools and invalid tools in the tools container. 2013-12-04 15:48:16 -05:00
Greg Von Kuster 340762bbf1 Correctly use the initialized test_environment dict when running the tool shed's install and test framework and additional code cleanup for the framework. 2013-12-04 15:07:39 -05:00
Greg Von Kuster 24ee75b05c Actually skip inspection of repository revisions that have the skip_tool_test set in the Tool Shed instead of just stating we're going to... 2013-12-04 11:01:32 -05:00
Greg Von Kuster 59e949f353 Final fixes for rendering installation errors in the tool test results container in the tool shed. 2013-12-04 10:29:59 -05:00
Greg Von Kuster 22df2c0db9 More fixes for rendering tests that resulted in installation errors within the tool test results container in the tool shed. 2013-12-04 09:49:17 -05:00
Dave Bouvier 88ec4149d2 Update test 0450 to also verify the list of testable revisions returned by the repository_revisions tool shed API controller. 2013-12-04 08:41:23 -05:00
Greg Von Kuster ea8d67499d Fix for displaying installation errors in the Tool Shed's tool test results container. 2013-12-03 16:15:03 -05:00
Greg Von Kuster 2f56fc479e Fix tool shed unit test I broke with a recent commit. 2013-12-03 15:52:46 -05:00
Greg Von Kuster 00857760f0 Fixes for filtering repository revision to be tested by the Tool Shed's install and test framework, and a new Tool Shed API script to enable analyzing the the Tool Shed's install and test framework. 2013-12-03 15:16:14 -05:00
Carl Eberhard 1a766e25a1 History panel: allow anon use of dataset search 2013-12-03 15:13:17 -05:00
Carl Eberhard e377fbcfc7 History panel: allow searching datasets: name, tags, annotation, dbkey, file_ext, blurb, and info will be searched when enter is pressed in the search field, include whitespace by enclosing search term in double quotes, allow specifying which field to search by using the idiom 'field=term' where field is any of the previous field names (or more user-centric aliases: database for dbkey, etc.), (GUI filters as an alternate means to accomplish field specifiers to be added soon); Allow showing and hiding search input; Tweak style on panel-header buttons; pack scripts 2013-12-03 15:03:32 -05:00
John Chilton 188dcb17e8 Another attempt to fix nosetests' handling of rods.py.
Further dirtying @dannon's code :(, sorry.
2013-12-03 12:59:35 -06:00
John Chilton 209243aa67 Remove unused get_missing_tool_dependencies in install_and_test_tool_shed_repositories/base/test_db_util.py.
Looks to have been replaced by method with same name in install_and_test_tool_shed_repositories/functional_tests.py and would throw a NameError on repository_id if ever used.
2013-12-03 11:54:56 -06:00
John Chilton ae34c75c7b Merged in jmchilton/galaxy-central-fork-1 (pull request #270)
Delay potential problems with fluent logger dependencies until fluent logger used.
2013-12-03 10:39:21 -06:00
Greg Von Kuster 28d2c1bb38 Code cleanup for rendering the tool test results container in the tool shed. 2013-12-03 11:32:00 -05:00
Dannon Baker 8bb209cae3 Merged in jmchilton/galaxy-central-fork-1 (pull request #269)
Object Store dependency refactoring, testing, and added LWR implementation.
2013-12-03 11:12:57 -05:00
Greg Von Kuster 8192156632 Refactoring code cleanup for installing tool dependencies from the tool shed into Galaxy. 2013-12-03 11:01:20 -05:00
Greg Von Kuster a91ccbf8fb Fix for determining if a required tool dependency is in an error state. 2013-12-03 09:35:05 -05:00
Aysam Guerler 8a3ff9163a UI: Improve masthead, simplify code 2013-12-03 01:42:58 -05:00
Greg Von Kuster b2c873bc1e Fix type in my last commit - thanks John! 2013-12-02 21:35:00 -05:00
Greg Von Kuster 93953d0a75 Tweak changeset 5b8c91e4183664c90f4d95699ab971e674ffd67d which created symlinks to a required tool dep endncy env.sh file for dependent tool dependencies being installed. This approach was better than the previous approach which parsed the requried repository's tool_dependencies.xml file to create the env.sh file. This changeset uses a slightly different approach: it creates an env.sh file for the dependent tool dependency whose first line "sources" the required tool dende pendcy's env.sh file. This allows for the dependent env.sh file to be managed by its tool dependency (e.g., its tool dependency may require additional env.sh paths beyond those contained in the requyired tool dependency's env.sh file). This changeset also handles sysncing the database with the file system when tool dependencies are being installed when handling a complex repository dependency definition. This process used to be handled only when not dealing with a complex repository dependency definition. This fix should correct problems encounted by the Tool Shed's install and test framework which were introduced in 5b8c91e4183664c90f4d95699ab971e674ffd67d. 2013-12-02 20:36:59 -05:00
John Chilton 32d5ef1820 Delay problems with fluent logger dependencies until fluent logger used. 2013-12-02 15:15:16 -06:00