From 384f846db54b9b830da8efee546be3073c863f7a Mon Sep 17 00:00:00 2001 From: mgummelt Date: Tue, 21 Mar 2017 15:56:59 -0700 Subject: [PATCH] [SPARK-427] fix strict mode in python tests (#130) --- bin/test.sh | 2 +- tests/test.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/test.sh b/bin/test.sh index 108a29cd677e5..7714a178d9e97 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -15,7 +15,7 @@ check_env() { -o -z "$S3_BUCKET" \ -o -z "$S3_PREFIX" \ -o -z "$TEST_JAR_PATH" \ - -o -z "$COMMONS_DIR"]; then + -o -z "$COMMONS_DIR" ]; then echo "Missing required env. See check in ${BIN_DIR}/test.sh." echo "Environment:" env diff --git a/tests/test.py b/tests/test.py index 93d7171f87973..26f451a4016e5 100644 --- a/tests/test.py +++ b/tests/test.py @@ -266,10 +266,9 @@ def _run_tests(app_url, app_args, expected_output, args=[]): def _submit_job(app_url, app_args, args=[]): if _is_strict(): - config['spark.mesos.driverEnv.MESOS_MODULES'] = \ - 'file:///opt/mesosphere/etc/mesos-scheduler-modules/dcos_authenticatee_module.json' - config['spark.mesos.driverEnv.MESOS_AUTHENTICATEE'] = 'com_mesosphere_dcos_ClassicRPCAuthenticatee' - config['spark.mesos.principal'] = 'service-acct' + args += ["--conf", 'spark.mesos.driverEnv.MESOS_MODULES=file:///opt/mesosphere/etc/mesos-scheduler-modules/dcos_authenticatee_module.json'] + args += ["--conf", 'spark.mesos.driverEnv.MESOS_AUTHENTICATEE=com_mesosphere_dcos_ClassicRPCAuthenticatee'] + args += ["--conf", 'spark.mesos.principal=service-acct'] args_str = ' '.join(args + ["--conf", "spark.driver.memory=2g"]) submit_args = ' '.join([args_str, app_url, app_args]) cmd = 'dcos --log-level=DEBUG spark --verbose run --submit-args="{0}"'.format(submit_args)