Merge pull request #8 from jenkinsci/JENKINS-22368

fix test failure
jenkinsci · Sep 30, 2014 · e4ff38c · e4ff38c
2 parents 6e99fb8 + 7cd4ed6
commit e4ff38c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/hudson/plugins/openid/GoogleAppSsoSecurityRealm.java b/src/main/java/hudson/plugins/openid/GoogleAppSsoSecurityRealm.java
@@ -41,7 +41,6 @@ public GoogleAppSsoSecurityRealm(String domain) throws IOException, OpenIDExcept
 
     @Override
     protected ConsumerManager createManager() throws ConsumerException {
-        addProxyPropertiesToHttpClient();
         HttpFetcherFactory fetcherFactory = new HttpFetcherFactory();
         YadisResolver2 resolver = new YadisResolver2(fetcherFactory);
         ConsumerManager m = new ConsumerManager(new RealmVerifierFactory(resolver), new Discovery(), fetcherFactory);

diff --git a/src/main/java/hudson/plugins/openid/OpenIdSsoSecurityRealm.java b/src/main/java/hudson/plugins/openid/OpenIdSsoSecurityRealm.java
@@ -83,6 +83,7 @@ public class OpenIdSsoSecurityRealm extends SecurityRealm {
     @DataBoundConstructor
     public OpenIdSsoSecurityRealm(String endpoint) throws IOException, OpenIDException {
         this.endpoint = endpoint;
+        addProxyPropertiesToHttpClient();
         getDiscoveredEndpoint();
     }
 
@@ -102,7 +103,6 @@ private ConsumerManager getManager() throws ConsumerException {
     }
 
     protected ConsumerManager createManager() throws ConsumerException {
-        addProxyPropertiesToHttpClient();
         HttpFetcherFactory fetcherFactory = new HttpFetcherFactory();
         YadisResolver2 resolver = new YadisResolver2(fetcherFactory);
         ConsumerManager manager = new ConsumerManager(new RealmVerifierFactory(resolver), new Discovery(), fetcherFactory);

diff --git a/src/test/java/hudson/plugins/openid/OpenIdSsoSecurityRealmTest.java b/src/test/java/hudson/plugins/openid/OpenIdSsoSecurityRealmTest.java
@@ -175,11 +175,16 @@ public void testProxyInformationAvailableForCreateManager()
 		openid = new OpenIdTestService(getServiceUrl(), getProps(),
 				Sets.newHashSet("foo", "bar"), Lists.newArrayList(
 						SREG_EXTENSION, AX_EXTENSION, TEAM_EXTENSION));
-
-		OpenIdSsoSecurityRealm realm = new OpenIdSsoSecurityRealm(openid.url);
-		hudson.proxy = new ProxyConfiguration(FAKE_PROXY_NAME,
-				FAKE_JENKINS_PROXY_PORT);
-		realm.createManager();
+        hudson.proxy = new ProxyConfiguration(FAKE_PROXY_NAME,
+                FAKE_JENKINS_PROXY_PORT);
+
+        try {
+            OpenIdSsoSecurityRealm realm = new OpenIdSsoSecurityRealm(openid.url);
+            realm.createManager();
+        } catch (DiscoveryException e) {
+            // This is expected since the proxy is fake. Hence, discovery will
+            // not be possible
+        }
 
 		assertEquals(FAKE_PROXY_NAME, HttpClientFactory.getProxyProperties()
 				.getProxyHostName());