[JENKINS-50790] Address feedback

jenkinsci · Apr 17, 2018 · 7ba7a39 · 7ba7a39
1 parent 81589c3
commit 7ba7a39
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/test/acceptance/FallbackConfig.java b/src/main/java/org/jenkinsci/test/acceptance/FallbackConfig.java
@@ -80,8 +80,8 @@ public class FallbackConfig extends AbstractModule {
 
     public static final String DOM_MAX_SCRIPT_RUN_TIME = "dom.max_script_run_time";
     public static final String DOM_MAX_CHROME_SCRIPT_RUN_TIME = "dom.max_chrome_script_run_time";
-    public static int PAGE_LOAD_TIMEOUT = 30;
-    public static int IMPLICIT_WAIT_TIMEOUT = 1;
+    public static final int PAGE_LOAD_TIMEOUT = 30;
+    public static final int IMPLICIT_WAIT_TIMEOUT = 1;
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java
@@ -228,12 +228,16 @@ public boolean installPlugins(final PluginSpec... specs) throws UnableToResolveD
                 }
             }
         } else {
+
             // JENKINS-50790 It seems that this page takes too much time to load when running in the new ci.jenkins.io
-            driver.manage().timeouts().pageLoadTimeout(time.seconds(60), TimeUnit.MILLISECONDS);
-            visit("available");
-            driver.manage().timeouts().pageLoadTimeout(time.seconds(FallbackConfig.PAGE_LOAD_TIMEOUT), TimeUnit.MILLISECONDS);
+            try {
+                driver.manage().timeouts().pageLoadTimeout(time.seconds(60), TimeUnit.MILLISECONDS);
+                visit("available");
+            } finally {
+                driver.manage().timeouts().pageLoadTimeout(time.seconds(FallbackConfig.PAGE_LOAD_TIMEOUT), TimeUnit.MILLISECONDS);
+            }
             // End JENKINS-50790
-            
+
             final ArrayList<PluginSpec> update = new ArrayList<>();
             for (final PluginSpec n : specs) {
                 switch (installationStatus(n)) {