Bring back configureUpdateCenter

jenkinsci · Jun 10, 2019 · 29e3c8d · 29e3c8d
1 parent df84f99
commit 29e3c8d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/src/main/java/jenkins/benchmark/jmh/JmhBenchmarkState.java b/src/main/java/jenkins/benchmark/jmh/JmhBenchmarkState.java
@@ -94,6 +94,7 @@ private void launchInstance() throws Exception {
 
         jenkins = new Hudson(temporaryDirectoryAllocator.allocate(), webServer);
         JenkinsRule._configureJenkinsForTest(jenkins);
+        JenkinsRule._configureUpdateCenter(jenkins);
         jenkins.getActions().add(this);
 
         Objects.requireNonNull(JenkinsLocationConfiguration.get()).setUrl(Objects.requireNonNull(getJenkinsURL()).toString());

diff --git a/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -416,6 +416,7 @@ public void before() throws Throwable {
 
         jenkins.setCrumbIssuer(new TestCrumbIssuer());  // TODO: Move to _configureJenkinsForTest after JENKINS-55240
         _configureJenkinsForTest(jenkins);
+        configureUpdateCenter();
 
         // expose the test instance as a part of URL tree.
         // this allows tests to use a part of the URL space for itself.
@@ -425,9 +426,10 @@ public void before() throws Throwable {
     }
 
     /**
-     * Configures the update center setting for the test.
-     * By default, we load updates from local proxy to avoid network traffic as much as possible.
-     * @param jenkins the instance to configure
+     * Configures a Jenkins instance for test.
+     *
+     * @param jenkins jenkins instance which has to be configured
+     * @throws Exception if unable to configure
      * @since TODO
      */
     public static void _configureJenkinsForTest(Jenkins jenkins) throws Exception {
@@ -438,7 +440,30 @@ public static void _configureJenkinsForTest(Jenkins jenkins) throws Exception {
 
         // set a default JDK to be the one that the harness is using.
         jenkins.getJDKs().add(new JDK("default", System.getProperty("java.home")));
+    }
+
+    private static void dumpThreads() {
+        ThreadInfo[] threadInfos = Functions.getThreadInfos();
+        Functions.ThreadGroupMap m = Functions.sortThreadsAndGetGroupMap(threadInfos);
+        for (ThreadInfo ti : threadInfos) {
+            System.err.println(Functions.dumpThreadInfo(ti, m));
+        }
+    }
 
+    /**
+     * Configures the update center setting for the test.
+     * By default, we load updates from local proxy to avoid network traffic as much as possible.
+     */
+    protected void configureUpdateCenter() throws Exception {
+        _configureUpdateCenter(jenkins);
+    }
+
+    /**
+     * Internal method used to configure update center to avoid network traffic.
+     * @param jenkins the Jenkins to configure
+     * @since TODO
+     */
+    public static void _configureUpdateCenter(Jenkins jenkins) throws Exception {
         final String updateCenterUrl;
         jettyLevel(Level.WARNING);
         try {
@@ -455,14 +480,6 @@ public static void _configureJenkinsForTest(Jenkins jenkins) throws Exception {
         sites.clear();
         sites.add(new UpdateSite("default", updateCenterUrl));
     }
-
-    private static void dumpThreads() {
-        ThreadInfo[] threadInfos = Functions.getThreadInfos();
-        Functions.ThreadGroupMap m = Functions.sortThreadsAndGetGroupMap(threadInfos);
-        for (ThreadInfo ti : threadInfos) {
-            System.err.println(Functions.dumpThreadInfo(ti, m));
-        }
-    }
 
     /**
      * Override to tear down your specific external resource.