Repository: mesos Updated Branches: refs/heads/master b35e8169d -> ebc277c32
Added default configuration file for CLI tests. This will be used by future tests, it overwrites the configuration file defined by the user. Review: https://reviews.apache.org/r/61211/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ebc277c3 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ebc277c3 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ebc277c3 Branch: refs/heads/master Commit: ebc277c324b6a88aa86c1f1fcb3a47876d37c8a2 Parents: b35e816 Author: Armand Grillet <agril...@mesosphere.io> Authored: Tue Sep 26 16:38:36 2017 +0200 Committer: Kevin Klues <klue...@gmail.com> Committed: Tue Sep 26 16:38:36 2017 +0200 ---------------------------------------------------------------------- src/python/cli_new/tests/default_config.toml | 2 ++ src/python/cli_new/tests/main.py | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ebc277c3/src/python/cli_new/tests/default_config.toml ---------------------------------------------------------------------- diff --git a/src/python/cli_new/tests/default_config.toml b/src/python/cli_new/tests/default_config.toml new file mode 100644 index 0000000..b816c0a --- /dev/null +++ b/src/python/cli_new/tests/default_config.toml @@ -0,0 +1,2 @@ +[master] + address = "127.0.0.1:9090" http://git-wip-us.apache.org/repos/asf/mesos/blob/ebc277c3/src/python/cli_new/tests/main.py ---------------------------------------------------------------------- diff --git a/src/python/cli_new/tests/main.py b/src/python/cli_new/tests/main.py index 3e4d2e4..9884649 100644 --- a/src/python/cli_new/tests/main.py +++ b/src/python/cli_new/tests/main.py @@ -18,6 +18,7 @@ This is the main executable of the mesos-cli unit tests. """ +import os import unittest from termcolor import colored @@ -30,6 +31,8 @@ from cli.tests import TestInfrastructure if __name__ == '__main__': CLITestCase.MESOS_BUILD_DIR = CLITestCase.default_mesos_build_dir() + os.environ["MESOS_CLI_CONFIG"] = os.path.join(os.path.dirname(__file__), + "default_config.toml") print colored("Running the Mesos CLI unit tests", "yellow") unittest.main(verbosity=2, testRunner=unittest.TextTestRunner)