Skip to content

Commit f594107

Browse files
authored
Merge pull request apache#110 from mesosphere/syntax
fix python syntax
2 parents 8239fb5 + e9f9de2 commit f594107

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

bin/jenkins-package-test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ function run() {
99
source bin/jenkins.sh
1010
install_cli
1111
docker_login
12-
make universe && export $(cat "${WORKSPACE}/stub-universe.properties")
12+
make universe
13+
export $(cat "${WORKSPACE}/stub-universe.properties")
1314
make test
1415
}
1516

cli/tests/integration/test_run.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import mock
2-
import pytest
31
import six
4-
52
from dcos_spark import spark_submit
63

4+
import mock
5+
import pytest
6+
77

88
@pytest.mark.skip(
9-
reason=("This is failing when fake.com fails to connect,"
10-
"but I don't want to spend the time to fix it, because this CLI is hopefully going"
11-
"away in 1.10."))
9+
reason=("This is failing when fake.com fails to connect, "
10+
"but I don't want to spend the time to fix it, because this CLI "
11+
"is hopefully going away in 1.10."))
1212
@mock.patch('subprocess.Popen')
1313
@mock.patch('dcos_spark.spark_submit.spark_app')
1414
def test_spark_hdfs_config_url(spark_app, Popen):

0 commit comments

Comments
 (0)