From 86c5c739fad62384fc64a624823999c17bb32e80 Mon Sep 17 00:00:00 2001
From: abayer <abayer@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Tue, 3 Nov 2009 20:41:44 +0000
Subject: [PATCH] Fixing UpdateSite.neverUpdate and tests to use it properly.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23459 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/UpdateSite.java          | 2 +-
 .../main/java/org/jvnet/hudson/test/HudsonTestCase.java  | 9 +++++----
 .../test/groovy/hudson/model/UpdateCenter2Test.groovy    | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index e6d31442d6..a38a696c85 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -549,7 +549,7 @@ public class UpdateSite {
 
     private static final Logger LOGGER = Logger.getLogger(UpdateSite.class.getName());
 
-    public static boolean neverUpdate = Boolean.getBoolean(UpdateCenter.class.getName()+".never");
+    public static boolean neverUpdate = Boolean.getBoolean(UpdateCenter.class.getName()+".neverUpdate");
 
     /**
      * Off by default until we know this is reasonably working.
diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
index 297c433637..ffa6621f88 100644
--- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
@@ -240,13 +240,14 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
         // load updates from local proxy to avoid network traffic.
         final String updateCenterUrl = "http://localhost:"+JavaNetReverseProxy.getInstance().localPort+"/update-center.json";
         
-        PersistedList<UpdateSite> sites = hudson.getUpdateCenter().getSites();
-        sites.clear();
-        sites.add(new UpdateSite("default", updateCenterUrl));
-
         // don't waste bandwidth talking to the update center
         DownloadService.neverUpdate = true;
         UpdateCenter.neverUpdate = true;
+        UpdateSite.neverUpdate = true;
+
+        PersistedList<UpdateSite> sites = hudson.getUpdateCenter().getSites();
+        sites.clear();
+        sites.add(new UpdateSite("default", updateCenterUrl));
 
         // expose the test instance as a part of URL tree.
         // this allows tests to use a part of the URL space for itself.
diff --git a/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy b/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy
index 2a896d196e..a0df3fa2f8 100644
--- a/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy
+++ b/test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy
@@ -37,9 +37,10 @@ public class UpdateCenter2Test extends HudsonTestCase {
      */
     void testInstall() {
         UpdateCenter.neverUpdate = false;
+        UpdateSite.neverUpdate = false;
         createWebClient().goTo("/") // load the metadata
         def job = hudson.updateCenter.getPlugin("changelog-history").deploy().get(); // this seems like one of the smallest plugin
         println job.status;
         assertTrue(job.status instanceof Success)
     }
-}
\ No newline at end of file
+}
-- 
GitLab