opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 22:06:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,103 Commits 72 Branches 243 Tags
3c47105732febe5ca69a6ba20df875177fb7a31a
Commit Graph
133 Commits
Author SHA1 Message Date
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 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 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 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 16c0ae216a De-duplicate XXX_TEST_DBPATH logic. 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 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 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
John Chilton 3369dfafa0 Synchronize a bunch of test launch and nose configure stuff. 2016-03-29 08:04:20 -04:00
John Chilton 3cb2bb1c35 Start work on synchronizing functional test drivers. 
- Tweak paths in same way.
 - Don't write tool shed temp files to GALAXY_ROOT - respect /tmp.
 - Build identical loggers.
 2016-03-29 08:04:19 -04:00
Nicola Soranzo 501a10c3f1 Do not import dumps and loads from galaxy.util.json . 2016-03-02 19:04:24 +00:00
Nicola Soranzo d85db9daa6 Use __file__ when adding paths to sys.path instead of os.getcwd() . 
Also insert additional paths in position 1 unless strictly necessary.
 2016-02-18 15:45:15 +00:00
John Chilton c408b0ec65 Do not check for tool migrations when running tests. 
This is an inappropriate time for the check and causes slow down when running tests.
 2015-11-25 15:19:30 +00:00
Nate Coraor 4a05d5ea12 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into smash_eggs 2015-10-20 18:59:06 -04:00
Nate Coraor 27ab6fe8f9 Use the database temp directory store the Mako template cache when 
running framework tests.
 2015-10-20 13:56:28 -04:00
Nate Coraor 0469ed29e0 Remove egg cruft from scripts/ 2015-09-21 15:55:07 -04:00
John Chilton bd55650f06 Add testing environment variable GALAXY_TEST_LOGGING_CONFIG. 
Unifies logging through the testing process. Requires adding a Galaxy option to disable its own attempts to configure a different root logger.
 2015-09-16 16:24:53 +01:00
Nicola Soranzo 6569c2dcc3 Partially lint scripts/ . 2015-07-13 20:13:28 +01:00
John Chilton 4e82c80293 Fix for 38679a0d32. 
Reported by @golharam.
 2015-06-18 15:57:49 -04:00
John Chilton 374795f631 Only cleanup successful jobs when testing. 
As per the recommendation of Ryan G. at http://dev.list.galaxyproject.org/keep-job-output-and-scripts-on-failed-tests-td4667327.html.

I considered making this 'never' - since those files will get cleaned up at the end anyway. This would actually reduce our test coverage related to job cleanup logic - so I have decided this is a fine a middle ground.
 2015-06-15 09:53:59 -04:00
John Chilton 98d8c2cc2e Allow config of shed tool conf used with `run_tests.sh -installed`. 
Set with GALAXY_TEST_SHED_TOOL_CONF.

This is required to implement galaxyproject/planemo#176.
 2015-05-18 02:07:36 -04:00
John Chilton 5d31ce641a Fix problem with twill's custom subprocess module. 
There has been for some time a scary warning when testing (http://dev.list.galaxyproject.org/run-test-sh-ImportError-cannot-import-name-args-from-interpreter-flags-td4666277.html) that I now understand is the result of Twill being packaged with its own custom subprocess module that conflicts with modules using multiprocessing (e.g. kombu).

After the #198 this scary warning has become an exception that prevents exception of tests (see https://travis-ci.org/galaxyproject/planemo/jobs/61547827 for instance). Importing subprocess seems to force Python to use the system module instead of twills - which seems to prevent these problems.

There have been other reports of this problem with Twill in other projects and removing the subprocess module didn't seem to break anything for them either.
 2015-05-06 20:24:50 -04:00