[#719] - skipping Bash implementation tests on Windows platform

versionpress · Feb 28, 2016 · 83ecb17 · 83ecb17
1 parent 2a5f625
commit 83ecb17
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/plugins/versionpress/tests/GitRepositoryTests/MergeDriverTest.php b/plugins/versionpress/tests/GitRepositoryTests/MergeDriverTest.php
@@ -66,6 +66,10 @@ public function mergeDriverUninstalledCorrectly() {
      */
     public function mergedWithoutConflictUsingBash() {
 
+        if(DIRECTORY_SEPARATOR == '\\') {
+            $this->markTestSkipped('mergedWithoutConflictUsingBash is skipped (no Bash on Windows).');
+        }
+
         MergeDriverInstaller::installMergeDriver(self::$initializationDir);
         MergeDriverTestUtils::switchDriverToBash();
 
@@ -80,6 +84,10 @@ public function mergedWithoutConflictUsingBash() {
      */
     public function mergedWithoutConflictInDateUsingBash() {
 
+        if(DIRECTORY_SEPARATOR == '\\') {
+            $this->markTestSkipped('mergedWithoutConflictInDateUsingBash is skipped (no Bash on Windows).');
+        }
+
         MergeDriverInstaller::installMergeDriver(self::$initializationDir);
         MergeDriverTestUtils::switchDriverToBash();
 

diff --git a/plugins/versionpress/tests/LoadTests/MergeDriverLoadTest.php b/plugins/versionpress/tests/LoadTests/MergeDriverLoadTest.php
@@ -63,6 +63,10 @@ public function phpDriverLoadTested() {
      */
     public function bashDriverLoadTested() {
 
+        if(DIRECTORY_SEPARATOR == '\\') {
+            $this->markTestSkipped('bashDriverLoadTested is skipped (no Bash on Windows).');
+        }
+
         MergeDriverInstaller::installMergeDriver(self::$initializationDir);
         MergeDriverTestUtils::switchDriverToBash();
         $this->prepareTestData();