-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve how various branches of Galaxy are testing.
Annotate tests that include a significant aspect of Galaxy behavior testing and paramerize them to allow overridding the target branch via an environment variable. By default switch all of these to test master, but create new tox profiles and Travis targets that only run these tests and run for other branches (dev, release_18.01, and release_17.09 currently). Also drop the py27-quick set of tests from Travis - going to be future facing and be happy with the python 3 tests for the quick turn around / stable tests.
- Loading branch information
Showing
8 changed files
with
66 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
from .test_utils import ( | ||
CliTestCase, | ||
mark, | ||
skip_if_environ, | ||
target_galaxy_branch, | ||
) | ||
|
||
|
||
class InitAndTestTestCase(CliTestCase): | ||
|
||
@skip_if_environ("PLANEMO_SKIP_GALAXY_TESTS") | ||
def test_init_and_test_master(self): | ||
self.__run_commands() | ||
|
||
@skip_if_environ("PLANEMO_SKIP_GALAXY_TESTS") | ||
def test_init_and_test_dev(self): | ||
self.__run_commands(test_args=["--galaxy_branch", "dev"]) | ||
|
||
def __run_commands(self, test_args=[]): | ||
@mark.tests_galaxy_branch | ||
def test_init_and_test(self): | ||
with self._isolate(): | ||
init_cmd = ["project_init", "--template", "demo", "basic"] | ||
self._check_exit_code(init_cmd) | ||
test_cmd = ["test", "--install_galaxy"] + test_args | ||
test_cmd += ["basic/cat.xml"] | ||
test_cmd = [ | ||
"test", | ||
"--no_dependency_resolution", | ||
"--galaxy_branch", target_galaxy_branch(), | ||
"basic/cat.xml" | ||
] | ||
self._check_exit_code(test_cmd) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters