Merge pull request apache#110 from mesosphere/syntax

fix python syntax
Adikteev · Jan 10, 2017 · f594107 · f594107
2 parents 8239fb5 + e9f9de2
commit f594107
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/bin/jenkins-package-test.sh b/bin/jenkins-package-test.sh
@@ -9,7 +9,8 @@ function run() {
     source bin/jenkins.sh
     install_cli
     docker_login
-    make universe && export $(cat "${WORKSPACE}/stub-universe.properties")
+    make universe
+    export $(cat "${WORKSPACE}/stub-universe.properties")
     make test
 }
 

diff --git a/cli/tests/integration/test_run.py b/cli/tests/integration/test_run.py
@@ -1,14 +1,14 @@
-import mock
-import pytest
 import six
-
 from dcos_spark import spark_submit
 
+import mock
+import pytest
+
 
 @pytest.mark.skip(
-    reason=("This is failing when fake.com fails to connect,"
-            "but I don't want to spend the time to fix it, because this CLI is hopefully going"
-            "away in 1.10."))
+    reason=("This is failing when fake.com fails to connect, "
+            "but I don't want to spend the time to fix it, because this CLI "
+            "is hopefully going away in 1.10."))
 @mock.patch('subprocess.Popen')
 @mock.patch('dcos_spark.spark_submit.spark_app')
 def test_spark_hdfs_config_url(spark_app, Popen):