Commit Graph
736 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
Martin Cech c093c793b7 Merge pull request #1958 from jmchilton/workflow_scheduling_testing
Improvements to workflow scaling performance testing scripts.
2016-03-25 22:32:28 -04:00
John Chilton 85ef86ab2e Improvements to workflow scaling performance testing scripts.
- Implement a wrapper script for launching a docker-galaxy-stable setup a many ways for this task including:
    - Configure container's Galaxy with outer Galaxy's lib and test directory.
    - Collect log files.
    - Log a statement for interacting with the container easily while the test is running.
    - Disable unneeded services.
 - Implement a fan-in-fan-out style workflow for performance testing.
 - Add an option to test performance of scheduling workflows without actually running jobs.
 - Sample tool for creating large collections easily at beginning of tests (much faster than uploads).
 - Sample tool for splitting a file into a collection for fan in and out workflow test.
 - Assume Python 2.7 in scripts to simplify things.
 - Add documentation.
2016-03-21 01:39:45 +00:00
John Chilton eee044aa70 Work toward automating deployment.
Create new makefile targets for release management.

 - ``release-create-issue``: Automates creating a release checklist - https://github.com/jmchilton/galaxy/issues/41)
   Check list contains actual tailored ``make`` commands and links (for PRs and issues).
 - ``release-check-metadata``: Checks milestone PRs for required metadata needed for generating bootstrapped release notes.
 ` ``release-bootstrap-history``: Bootstrap release notes from PRs and metadata.
 - ``release-check-blocking-prs``: Check for PRs blocking release, should happen before branching release and before tagging release.
 - ``release-check-blocking-issues``: Check for Issues blocking release, should happen before tagging release. (Only allowed issue is the release creation issue.)

The issue created with ``release-create-issue`` documents how and when to execute subsequent ``make`` targets (including the target to create the issue for the next release).

This PR contains a bunch of other enhancements to the bootstrap_history.py script to enable these targets and renames ``create_release_rc`` Makefile target so all release related targets start with the prefix ``release-``.

Conflicts:
	Makefile
2016-03-16 15:02:02 +00:00
peterjc 7e5d99ebb2 Update check_python.py now dropping Python 2.6
Closes #1596
2016-03-07 15:50:05 +00:00
Nicola Soranzo 501a10c3f1 Do not import dumps and loads from galaxy.util.json . 2016-03-02 19:04:24 +00:00
John Chilton 94f847b3b2 Merge pull request #1755 from nsoranzo/flake8_fixes
Fix the remaining 1334 flake8 errors in scripts/ .
2016-02-25 08:11:55 -05:00
Nate Coraor 8943a0f86b Add the script I used to create security patches 2016-02-24 16:54:30 -05: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
Nicola Soranzo 196d174716 Python 3 support for 3 files. 2016-02-18 15:45:15 +00:00
Nicola Soranzo 93348e7199 Fix the remaining 1334 flake8 errors in scripts/ . Close #391. 2016-02-18 15:45:15 +00:00
Martin Cech db1bb2f191 Merge pull request #1556 from jmchilton/datatype_imports
Code design and legacy cleanup of datatypes and metadata.
2016-02-09 12:44:59 -05:00
Nate Coraor 9551fc07b4 Add the scientific platform (Scientific Linux) as binary compatible
with RHEL.
2016-02-03 13:33:42 -05:00