From f744d64b92b3b18e4e07ed3bba5b310eb0a00720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raphael=20von=20der=20Gr=C3=BCn?= <raphinesse@gmail.com>
Date: Fri, 26 Apr 2019 14:20:16 +0200
Subject: [PATCH] Conditionally skip the _one_ broken test for VS 2017 (#330)

...instead of allowing whole suite to fail.
---
 appveyor.yml              |  4 ----
 spec/e2e/endtoend.spec.js | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 94a8d4c0..2caf60ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,10 +31,6 @@ environment:
     - nodejs_version: "6"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
-matrix:
-  allow_failures:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
 install:
   - ps: Install-Product node $env:nodejs_version
   - npm install
diff --git a/spec/e2e/endtoend.spec.js b/spec/e2e/endtoend.spec.js
index f5a70d83..0ce205d9 100644
--- a/spec/e2e/endtoend.spec.js
+++ b/spec/e2e/endtoend.spec.js
@@ -213,7 +213,16 @@ describe('Cordova create and build', function () {
 
     // --release --bundle
 
-    // here be 6a
+    it('spec.6a should generate appxupload and appxbundle for Windows 10 project bundle release build', function () {
+        // FIXME Fails for VS 2017 on AppVeyor
+        if (process.env.APPVEYOR_BUILD_WORKER_IMAGE === 'Visual Studio 2017') {
+            pending('This test is broken for VS 2017 on AppVeyor');
+        }
+
+        shell.exec(buildScriptPath + ' --release --bundle --archs=\"x64 x86 arm\"', { silent: silent });
+        _expectExist(/.*bundle\.appxupload$/, 3);
+        _expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_Test', 'CordovaApp.Windows10_1.0.0.0_x64_x86_arm.appxbundle');
+    });
 
     it('spec.6b should generate appxupload and appxbundle for Windows Phone 8.1 project bundle release build', function () {
         shell.exec(buildScriptPath + ' --release --appx=8.1-phone --bundle --archs=\"x64 x86 arm\"', { silent: silent });
@@ -240,11 +249,4 @@ describe('Cordova create and build', function () {
         _expectSubdirAndFileExist('CordovaApp.Phone_1.0.0.0_arm_Test', 'CordovaApp.Phone_1.0.0.0_arm.appx');
         _expectSubdirAndFileExist('CordovaApp.Phone_1.0.0.0_x86_Test', 'CordovaApp.Phone_1.0.0.0_x86.appx');
     });
-
-    // this will be move up again when it is fixed for VS 2017 on AppVeyor
-    it('spec.6a should generate appxupload and appxbundle for Windows 10 project bundle release build', function () {
-        shell.exec(buildScriptPath + ' --release --bundle --archs=\"x64 x86 arm\"', { silent: silent });
-        _expectExist(/.*bundle\.appxupload$/, 3);
-        _expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_Test', 'CordovaApp.Windows10_1.0.0.0_x64_x86_arm.appxbundle');
-    });
 });