Commit Graph
2076 Commits
Author SHA1 Message Date
Martin Cech e5ce5dfe33 try pushing again when we get unexpected exception... 2016-04-11 13:16:14 -04:00
Martin Cech 0ff81d3dcb remove buildbot remnants 2016-04-11 11:19:39 -04:00
Martin Cech 4138860bfd Merge pull request #2075 from jmchilton/conda_download_fixes
Fix deps.command.download_command on Mac OS X.
2016-04-05 16:25:23 -04:00
Nate Coraor 2bd4de2025 Fix things found by @mvdbeek 2016-04-05 14:59:09 -04:00
John Chilton 7aa2d6840a Implement IntegrationTestCase and EmbeddedPulsarTestCase.
IntegrationTestCases differ from functional tests in that they start up a Galaxy instance configured on a per test class basis - so this new class of "integration tests" can test configuration modalities of Galaxy that cannot be tested with traditional Galaxy functional tests.
2016-04-04 20:08:55 -04:00
John Chilton 53f1782964 Allow setting job_conf path for functional tests. 2016-04-04 14:39:17 -04:00
John Chilton 3b31f23eb6 Fix deps.command.download_command on Mac OS X.
Previously -O- and --recursive would be used together - this doesn't seem to be possible on Mac OS X.

See issue https://github.com/galaxyproject/planemo/issues/431.
2016-04-04 12:04:01 -04:00
John Chilton e02e97dc79 Merge pull request #2067 from jmchilton/shed_tests
Adjust testing directories so no python root is ever "tool_shed".
2016-04-01 22:30:27 -04:00
Dave Bouvier 27f99cdf40 Fix test data path. 2016-04-01 14:50:26 -04:00
Nicola Soranzo 26569c3ec4 Merge pull request #2066 from jmchilton/static_tool_conf
Allow tool confs with a tool_path to not be interpreted as shed confs.
2016-04-01 18:03:56 +01:00
John Chilton 4c216f1077 Adjust testing directories so no python root is ever "tool_shed".
We have a tool_shed directory in lib, so if we enter a test case from some path and test/tool_shed happens to be a valid python top-level module - it blocks out lib/tool_shed and Galaxy doesn't work properly in the test.

A similar problem was encountered with unit tests and fixed with https://github.com/galaxyproject/galaxy/commit/df442a06382f23bdf0401bdd632b9584d3431281 - but I have decided that directory name was a bit log and so this commit unifies the approach to unit and functional test names for tool shed tests.
2016-04-01 10:09:49 -04:00
John Chilton 34e3b7f1c2 Rename shed_conf attribute to is_shed_conf.
Per discussion with @nsoranzo.
2016-04-01 10:01:54 -04:00
Nicola Soranzo 205850586e Use a stricter regexp for microseconds. 2016-04-01 14:46:30 +01:00
John Chilton cb5e786aa9 Allow tool confs with a tool_path to not be interpreted as shed confs. 2016-04-01 09:28:46 -04:00
carlfeberhard 46b4e8d94c Managers: remove UTC zone when parsing dates
This change creates a more complete regex for parsing dates used in filters. MySQL in particular errored when the UTC zone character 'Z' was appended to a valid iso 8601 date (because it's MySQL). The FilterParser.parse_date method now:
- strips both the separator 'T' and any ending 'Z'
- one space are allowed as the date/time separator
- milliseconds are permitted
- both time and time with milliseconds are optional
- any added timezone (besides the UTC Z) will cause an error
- feedback was made more clear
- tests were added (and should make the above more clear)
2016-03-31 15:00:50 -04:00
Dannon Baker 829c84c8cb Merge branch 'release_16.01' into dev 2016-03-31 13:35:39 -04:00
Martin Cech 0bcc7e37e1 rename test to reflect insides 2016-03-31 11:11:38 -04:00
Martin Cech 28b5dd3683 add TS test for disabled hg push 2016-03-31 11:11:31 -04:00
Nicola Soranzo a560ad8999 Update Tool Shed tests after disabling 'hg push' 2016-03-31 11:11:26 -04:00
Martin Cech a218b6ed2a Revert "disable 'hg push' to TS repositories" 2016-03-30 11:00:01 -04:00
Dannon Baker 9a12c14d22 Merge pull request #2033 from martenson/remove-hg-direct-api
disable 'hg push' to TS repositories
2016-03-30 10:49:11 -04:00
Dannon Baker 35767b1380 Merge pull request #2030 from jmchilton/capsule_fix
Fix transiently failing tool shed tests.
2016-03-30 09:24:51 -04:00
Nicola Soranzo 0fce175aad Update Tool Shed tests after disabling 'hg push' 2016-03-30 12:54:34 +01:00
Dannon Baker d15b1030c5 Merge, rebuild. 2016-03-29 16:03:18 -04:00
Aysam Guerler d693aaf624 Merge pull request #2016 from jmchilton/test_driver_cleanup
Functional Test Drivers Overhaul
2016-03-29 14:36:09 -04:00
John Chilton 7b2a2b1ef1 [16.01] More robust test_lazy_process.
Hopefully this will fix a transiently failing test (I've only seen in fail on OS X).
2016-03-29 12:24:51 -04:00
guerler 9f0ddf57bb Revise input wrapper, add test cases 2016-03-29 12:02:10 -04:00
John Chilton 516f4f017f Fix transiently failing tool shed tests.
Comments inline - I don't know why but the retry would fix the transient problems acording to the Jenkins tests with the previous exception added to verify this would fix the problem.
2016-03-29 11:47:36 -04:00
John Chilton 05a2f44126 Separate different style Galaxy testing behaviors into classes. 2016-03-29 08:04:28 -04:00
John Chilton 6faef4df2e Introduce a TestDriver class to reduce duplication between test drivers.
Classes allow de-duplicating logic and state organization in a different way than methods. Use a common setup, run, tear down paradigm for these tests.
2016-03-29 08:04:28 -04:00
John Chilton eac6c10ec9 Allow running Galaxy tests on an existing external instance. 2016-03-29 08:04:27 -04:00
John Chilton 915b7edcb7 Unify and simplify script driver argument processing. 2016-03-29 08:04:27 -04:00
John Chilton 93cfdff910 Eliminate last custom config value setup in scripts/functional_tests.py...
... outside of driver_util. So now we can just use the driver_util config object.
2016-03-29 08:04:27 -04:00
John Chilton 586fa6801b Move yet more logic into driver_util to reduce driver method for scripts/functional_tests.py. 2016-03-29 08:04:27 -04:00
John Chilton e1aa0b3acc Simplify/unify tool conf handling logic across two driver util... 2016-03-29 08:04:27 -04:00
John Chilton f3c757ff1c Move more galaxy config into driver_util...
Handle logging and enabling of beta formats consistently across driver scripts.
2016-03-29 08:04:26 -04:00
John Chilton a8033a543b Move galaxy test data manager setup logic into driver_util. 2016-03-29 08:04:26 -04:00
John Chilton 362194b2c0 Cleanup logic for GALAXY_TEST_TMP_DIR add docs. 2016-03-29 08:04:26 -04:00
John Chilton 3c72c2129b Move data_manager_config_file setup into driver_util.
Seems it doesn't hurt tool shed tests to configure this.
2016-03-29 08:04:26 -04:00
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 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 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