Remove Windows integration tests dependency on Unix commands

Author: mhsmith

product/gradle-plugin/src/test/integration/data/BuildPython/args_1/app/build.gradle

@@ -11,7 +11,9 @@ android {
         versionCode 1
         versionName "0.0.1"
         python {
-            buildPython "echo echo_args1"
+            def py = System.getProperty("os.name").startsWith("Windows") ? "py" : "python3"
+            // Single string, split on whitespace.
+            buildPython "$py -c print('echo_args1')"
             pip {
                 install "six"
             }

product/gradle-plugin/src/test/integration/data/BuildPython/args_2/app/build.gradle

@@ -11,7 +11,9 @@ android {
         versionCode 1
         versionName "0.0.1"
         python {
-            buildPython "echo", "echo_args2"
+            def py = System.getProperty("os.name").startsWith("Windows") ? "py" : "python3"
+            // Multiple strings in a list.
+            buildPython py, "-c", "print('echo_args2')"
             pip {
                 install "six"
             }

product/gradle-plugin/src/test/integration/data/BuildPython/override/app/build.gradle

@@ -14,7 +14,7 @@ android {
         versionCode 1
         versionName "0.0.1"
         python {
-            buildPython System.getenv("buildpython")
+            buildPython System.getenv("buildpython").split("\s+")
             pip {
                 install "six"
             }

product/gradle-plugin/src/test/integration/data/BuildPython/silent_failure/app/build.gradle

@@ -11,7 +11,10 @@ android {
         versionCode 1
         versionName "0.0.1"
         python {
-            buildPython "true"
+            buildPython(
+                System.getProperty("os.name").startsWith("Windows") ? "py" : "python3",
+                "-c", "exit()"
+            )
             pip {
                 install "six"
             }

product/gradle-plugin/src/test/integration/test_gradle_plugin.py

@@ -315,10 +315,14 @@ def check_dsl(self, *layers):
             })
 
         run.rerun(variants=["bpProperty-debug"], succeed=False)
-        self.assertInStderr(BuildPython.problem_error("python-property"), run, re=True)
+        self.assertInStderr(
+            BuildPython.invalid_error("python-property", BuildPython.PROBLEM),
+            run, re=True)
 
         run.rerun(variants=["bpMethod-debug"], succeed=False)
-        self.assertInStderr(BuildPython.problem_error("python-method"), run, re=True)
+        self.assertInStderr(
+            BuildPython.invalid_error("python-method", BuildPython.PROBLEM),
+            run, re=True)
 
 
 class ChaquopyPlugin(GradleTestCase):
@@ -682,7 +686,8 @@ def test_syntax_error(self):
         self.RunGradle("base", "Pyc/syntax_error", app=["bad.py", "good.pyc"], pyc=["stdlib"])
 
     def test_buildpython(self):
-        message = BuildPython.problem_error("pythoninvalid", advice="")
+        message = BuildPython.invalid_error(
+            "pythoninvalid", BuildPython.PROBLEM, advice="")
         kwargs = dict(app=["hello.py"], pyc=["stdlib"])
 
         run = self.RunGradle("base", "Pyc/buildpython_warning", **kwargs)
@@ -738,15 +743,15 @@ def missing_error(cls, version, advice=SEE):
     def invalid_error(
         cls, command, error, *, version=DEFAULT_PYTHON_VERSION, advice=SEE
     ):
+        command_split = re.split(r"\s+", command)
+        if error in [cls.PROBLEM, cls.NON_ZERO]:
+            error = error.format(command_split[0])
+
         return (
-            fr"\[{re.escape(command)}\] is not a valid Python {version} command: "
-            fr"{error}\. {advice}"
+            fr"\[{re.escape(', '.join(command_split))}\] "
+            fr"is not a valid Python {version} command: {error}\. {advice}"
         )
 
-    @classmethod
-    def problem_error(cls, command, **kwargs):
-        return cls.invalid_error(command, cls.PROBLEM.format(command), **kwargs)
-
     def test_default(self):
         run = self.RunGradle(
             "base", "BuildPython/default", add_path=["bin"], succeed=False)
@@ -785,8 +790,10 @@ def assert_probed(self, run, probed, *, found=True):
 
     def test_invalid(self):
         run = self.RunGradle("base", "BuildPython/override", run=False)
-        self.run_override(run, "python-bad", error=self.PROBLEM.format("python-bad"))
-        self.run_override(run, "false", error=self.NON_ZERO.format("false"))
+        self.run_override(run, "python-bad", error=self.PROBLEM)
+        self.run_override(
+            run, ("py" if os.name == "nt" else "python3") + " -c exit(1)",
+            error=self.NON_ZERO)
 
         for version in [OLD_PYTHON_VERSION, NON_DEFAULT_PYTHON_VERSION]:
             with self.subTest(version):
@@ -835,14 +842,14 @@ def test_venv(self):
 
     def test_args(self):  # Also tests making a change.
         run = self.RunGradle("base", "BuildPython/args_1", succeed=False)
-        self.assertInStdout("echo_args1", run)
+        self.assertInStdout(r"^echo_args1$", run, re=True)
         run.apply_layers("BuildPython/args_2")
         run.rerun(succeed=False)
-        self.assertInStdout("echo_args2", run)
+        self.assertInStdout(r"^echo_args2$", run, re=True)
 
     def test_space(self):
         run = self.RunGradle("base", "BuildPython/space", succeed=False)
-        self.assertInStdout("Hello Chaquopy", run)
+        self.assertInStdout(r"^Hello Chaquopy$", run, re=True)
 
     # Test a buildPython which returns success without doing anything (possibly the
     # cause of #250).
@@ -856,16 +863,16 @@ def test_silent_failure(self):
     def test_variant(self):
         run = self.RunGradle("base", "BuildPython/variant", variants=["red-debug"],
                              succeed=False)
-        self.assertInStderr(self.problem_error("python-red"), run, re=True)
+        self.assertInStderr(self.invalid_error("python-red", self.PROBLEM), run, re=True)
         run.rerun(variants=["blue-debug"], succeed=False)
-        self.assertInStderr(self.problem_error("python-blue"), run, re=True)
+        self.assertInStderr(self.invalid_error("python-blue", self.PROBLEM), run, re=True)
 
     def test_variant_merge(self):
         run = self.RunGradle("base", "BuildPython/variant_merge", variants=["red-debug"],
                              succeed=False)
-        self.assertInStderr(self.problem_error("python-red"), run, re=True)
+        self.assertInStderr(self.invalid_error("python-red", self.PROBLEM), run, re=True)
         run.rerun(variants=["blue-debug"], succeed=False)
-        self.assertInStderr(self.problem_error("python-blue"), run, re=True)
+        self.assertInStderr(self.invalid_error("python-blue", self.PROBLEM), run, re=True)
 
 
 class PythonReqs(GradleTestCase):