changeset 6554:fa16857ad91c

RT-35635: allow MAS packaging test to attempt if a valid set of certificates is found
author Danno Ferrin (shemnon) <danno.ferrin@oracle.com>
date Thu, 27 Mar 2014 11:37:26 -0600
parents 66768fc644fb
children 1f5fae787211
files modules/fxpackager/src/test/java/com/oracle/bundlers/mac/MacAppStoreBundlerTest.java
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/fxpackager/src/test/java/com/oracle/bundlers/mac/MacAppStoreBundlerTest.java	Thu Mar 27 08:12:42 2014 -0400
+++ b/modules/fxpackager/src/test/java/com/oracle/bundlers/mac/MacAppStoreBundlerTest.java	Thu Mar 27 11:37:26 2014 -0600
@@ -57,8 +57,6 @@
 
     @BeforeClass
     public static void prepareApp() throws IOException {
-        Assume.assumeTrue(false);
-
         // only run on mac
         Assume.assumeTrue(System.getProperty("os.name").toLowerCase().contains("os x"));
 
@@ -76,6 +74,9 @@
             String commandOutput = baos.toString();
             Assume.assumeTrue(commandOutput.contains(signingKeyName));
             System.err.println("Valid certificate present");
+        } catch (Throwable t) {
+            System.err.println("Valid certificate not present, skipping test.");
+            Assume.assumeTrue(false);
         }