opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,108 Commits 62 Branches 243 Tags
1b80e6e8d1e4e2ecddaac4b37337e7cfd7016d57
Commit Graph
22108 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John Chilton 1b80e6e8d1 Move another galaxy config (clean up job) into driver_util. 2016-03-29 08:04:26 -04:00
John Chilton e356c80c02 Move enable_tool_shed_check test driver logic into driver_util. 2016-03-29 08:04:26 -04:00
John Chilton 5b826a0839 Move more galaxy config logic into driver_util. 
This time for galaxy master API key.
 2016-03-29 08:04:26 -04:00
John Chilton 65806641c1 Simplify(?) tool data table config logic at lest in scripts/functional_tests.py. 2016-03-29 08:04:25 -04:00
John Chilton d657855b7f Remove unused test_conf variable. 2016-03-29 08:04:25 -04:00
John Chilton 3c47105732 Fix shed tool test file shed_tools_dict handling. 
Instead of writing it below GALAXY_ROOT (which it shouldn't do at all) - add to the temp directory managed for the test so that special clean up logic isn't required for it. The global switch GALAXY_TEST_NO_CLEANUP can be used to recover the state of this file if needed now also.
 2016-03-29 08:04:25 -04:00
John Chilton 33d312b906 [16.01] Fix for running jobs when metadata tool is not in toolbox. 
Happens when -installed or -migrated are passed into run_tests.sh because of the way the tool shed hacks up Galaxy's tool config.
 2016-03-29 08:04:25 -04:00
John Chilton 671b6933dd De-duplicate test driver logic for closing apps and stopping severs... 2016-03-29 08:04:25 -04:00
John Chilton 0f36229400 Unify and simplify configuration and launch of test web servers. 
- Sync up the logic for reading and setting GALAXY_TEST_HOST, GALAXY_TEST_PORT, TOOL_SHED_TEST_HOST, and TOOL_SHED_TEST_PORT.
 - Setup one high level method for taking a Galaxy-style "app" and creating a webapp from a factory method and then launching a paste server for that entity respecting the above variables.
 2016-03-29 08:04:25 -04:00
John Chilton ee537a119b Restructure to simplify the main() in scripts/functional_tests.py. 
Previously this was entering a conditional on the same condition twice. This simplifies this to just do that once and makes the galaxy and tool shed driver code look more similar with respect to launching a Galaxy webapp.
 2016-03-29 08:04:25 -04:00
John Chilton ecbb732665 Move construction of test driver app objects into driver_util. 
This de-duplicates some of the Galaxy stuff and makes the tool shed stuff look very uniform.
 2016-03-29 08:04:25 -04:00
John Chilton ec0a123849 Unify and simplify how Galaxy is launched across test drivers. 2016-03-29 08:04:24 -04:00
John Chilton 2729699bf6 Further unification of how to setup Galaxy databases for testing. 
Reuse setup_galaxy_config for this task.
 2016-03-29 08:04:24 -04:00
John Chilton fe460008fa More work on syncrhonized test database configuration... 
for test drivers.
 2016-03-29 08:04:24 -04:00
John Chilton 528b74ca1e Remove unused test job conf stuff. 
Not that this wouldn't be useful - it would be but it wasn't wired up to do anything currently.
 2016-03-29 08:04:24 -04:00
John Chilton be0107b620 Simplify test tool_data_table_config logic. 
Added with https://github.com/galaxyproject/galaxy/commit/246ea04cc7ee1d0d470a514302bf2623f845ed8f.
 2016-03-29 08:04:24 -04:00
John Chilton 651b91248b Restructure scripts/functional_test.py's main() to reflect recent simplifications. 2016-03-29 08:04:24 -04:00
John Chilton e7b5293534 Refactor toolbox hacks used by installed and migration tool tests out... 
into driver_util. This greatly simplifies the code structure of scripts/functional_tests.py's main method.

Add description of GALAXY_TEST_SHED_TOOL_CONF and some documentation to all of this.
 2016-03-29 08:04:24 -04:00
John Chilton d03651f4ef Move more shared galaxy configuration into driver_util. 2016-03-29 08:04:24 -04:00
John Chilton 88ce7a2fa4 Remove unused branch for tool shed test driver code. 2016-03-29 08:04:23 -04:00
John Chilton 18c366c6d0 Remove now unused variable and documentation. 2016-03-29 08:04:23 -04:00
John Chilton 6b278478d3 Move tool_path logic into setup_galaxy_config. 2016-03-29 08:04:23 -04:00
John Chilton 5af770972d Fix naming and comment best practices for test driver scripts. 2016-03-29 08:04:23 -04:00
John Chilton dcbdcbe081 Unify tool dependency dir handling between test driver scripts. 2016-03-29 08:04:23 -04:00
John Chilton 7eab64eed0 Remove unused shed tool dependency logic in tool shed tests. 2016-03-29 08:04:23 -04:00
John Chilton e309c7f6eb Make XXX_TEST_DBPATH and XXX_TEST_DB_TEMPLATE generic and shared with shed. 
Now the variable TOOL_SHED_TEST_DB_TEMPLATE works as one might expect like GALAXY_TEST_DB_TEMPLATE.
 2016-03-29 08:04:23 -04:00
John Chilton ec3f0506c9 Remove unused config variable from test drivers. 2016-03-29 08:04:23 -04:00
John Chilton a18cbd5930 De-duplicate test driver - move more Galaxy config into common method. 2016-03-29 08:04:22 -04:00
John Chilton e86fa83e86 Begin work on test driver function for setting up Galaxy config. 2016-03-29 08:04:22 -04:00
John Chilton c2b260539b Start list of environment variables used for testing. 2016-03-29 08:04:22 -04:00
John Chilton 16c0ae216a De-duplicate XXX_TEST_DBPATH logic. 2016-03-29 08:04:22 -04:00
John Chilton 75f0cb470c Eliminate ability to set Galaxy tool path for tool shed tests... 
Makes sense in Galaxy tests but not for tool shed tests, I see no reason for this extension point. If it is needed GALAXY_CONFIG_TOOL_PATH will work instead of TOOL_SHED_TEST_TOOL_PATH.
 2016-03-29 08:04:22 -04:00
John Chilton 72716750d1 Simplify GALAXY_TEST_SAVE logic... 
... script/functional_tests.py was just pulling it out of the environ and sticking it back in - made no sense.
 2016-03-29 08:04:22 -04:00
John Chilton 9804eb56bf De-duplicate test driver logic for install database connection. 2016-03-29 08:04:22 -04:00
John Chilton fd46a1f987 Move tool_conf logic for drivers into driver_util. 
- Don't generate a tool_conf for upload in tool shed tests - just use the fixed one setup for framework tools.
- Move every mention of that directory and files into constants in driver_util.
 2016-03-29 08:04:22 -04:00
John Chilton 97070b4b53 Move tool shed test data handling into driver_util. 2016-03-29 08:04:21 -04:00
John Chilton ce9a55207f Remove unused or un-useful code from tool shed test driver. 2016-03-29 08:04:21 -04:00
John Chilton 91a7106897 Remove unused proxy port stuff in test drivers. 2016-03-29 08:04:21 -04:00
John Chilton db37011d70 De-duplicate code for cleaning up test directories. 2016-03-29 08:04:21 -04:00
John Chilton fe39f5bf55 Revise test driver logging so log is available in driver_util. 2016-03-29 08:04:21 -04:00
John Chilton 887edb647b Remove no longer valid sample references in scripts/functional_tests.py. 2016-03-29 08:04:21 -04:00
John Chilton e0a9d6b67f De-duplicate code for setting up Galaxy database. 2016-03-29 08:04:21 -04:00
John Chilton 8c857694f3 Synchronize locale handling for test drivers. 2016-03-29 08:04:21 -04:00
John Chilton 34f154d92e Rework upload tool. 2016-03-29 08:04:20 -04:00
John Chilton d0ee53f801 Simplify ignore_files logic in scripts/functional_tests.py. 
These details are taken care of by run_tests.sh.
 2016-03-29 08:04:20 -04:00
John Chilton 103098c7e4 De-duplicate and simplify launching a webapp for functional tests. 2016-03-29 08:04:20 -04:00
John Chilton b7c75f20a5 Eliminate duplication in waiting for HTTP servers in test drivers. 2016-03-29 08:04:20 -04:00
John Chilton d60fe9f5aa Synchronize static configuration stuff. 2016-03-29 08:04:20 -04:00
John Chilton 173d98484b Eliminate always True variable to simplify test driver logic. 
For now, always serve static content with these tests.
 2016-03-29 08:04:20 -04:00
John Chilton 55297b75e1 Sync code for retrieving prepopulated databases. 2016-03-29 08:04:20 -04:00