Skip to content

Commit

Permalink
[JENKINS-19081] Deleting failing test updateDirectlyWithHtml.
Browse files Browse the repository at this point in the history
loadJSON does not support parsing HTML.
Nor should it need to, since UC URLs are supposed to be to the JSONP file.
The .html extension is added automatically by downloadService when postBack is supported.
(cherry picked from commit d6b37a9)

Conflicts:
	test/src/test/java/hudson/model/UpdateSiteTest.java
	test/src/test/resources/hudson/model/update-center.json.html
  • Loading branch information
jglick authored and olivergondza committed Apr 13, 2014
1 parent a88fa41 commit bb91cbf
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
7 changes: 0 additions & 7 deletions test/src/test/java/hudson/model/UpdateSiteTest.java
Expand Up @@ -127,11 +127,4 @@ public void shutdownWebserver() throws Exception {
assertEquals(FormValidation.ok(), us.updateDirectly(/* TODO the certificate is now expired, and downloading a fresh copy did not seem to help */false).get());
assertNotNull(us.getPlugin("AdaptivePlugin"));
}

@Test public void updateDirectlyWithHtml() throws Exception {
UpdateSite us = new UpdateSite("default", new URL(baseUrl, "update-center.json.html").toExternalForm());
assertNull(us.getPlugin("AdaptivePlugin"));
assertEquals(FormValidation.ok(), us.updateDirectly(false).get());
assertNotNull(us.getPlugin("AdaptivePlugin"));
}
}
3 changes: 0 additions & 3 deletions test/src/test/resources/hudson/model/update-center.json.html

This file was deleted.

0 comments on commit bb91cbf

Please sign in to comment.