Fix test

jenkinsci · Apr 8, 2016 · 1c60167 · 1c60167
1 parent fcdebe5
commit 1c60167
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
@@ -404,12 +404,17 @@ private void dynamicLoad(String plugin) throws IOException, InterruptedException
 
         // wait for all the download jobs to complete
         boolean done = true;
+	boolean passed = true;
         do {
             Thread.sleep(100);
-            for(UpdateCenterJob job : r.jenkins.getUpdateCenter().getJobs()) {
+	    done = true;
+    	    for(UpdateCenterJob job : r.jenkins.getUpdateCenter().getJobs()) {
                 if(job instanceof UpdateCenter.DownloadJob) {
-                    done &= ((UpdateCenter.DownloadJob)job).status.isSuccess();
-                }
+		    UpdateCenter.DownloadJob j = (UpdateCenter.DownloadJob)job;
+		    assertFalse(j.status instanceof UpdateCenter.DownloadJob.Failure);
+                    done &= !(((j.status instanceof UpdateCenter.DownloadJob.Pending) || 
+			(j.status instanceof UpdateCenter.DownloadJob.Installing)));
+                }		
             }
         } while(!done);
 

diff --git a/test/src/test/resources/plugins/upload-test-update-center.json b/test/src/test/resources/plugins/upload-test-update-center.json
@@ -1,5 +1,5 @@
 updateCenter.post(
-{"connectionCheckUrl":"http://www.google.com/", // has to be here because updateDirectly sniffs only very limited formats
+{"connectionCheckUrl":"http://www.google.com/", 
     "core": {
         "buildDate": "Dec 31, 1969",
         "name": "core",
@@ -27,7 +27,7 @@ updateCenter.post(
 	    "releaseTimestamp": "2016-04-04T16:26:54.00Z",
 	    "requiredCore": "1.565",
 	    "scm": "github.com",
-	    "sha1": "5Ffulp5hSySnUL3gs427m6wVFJ4=",
+	    "sha1": "XWJpfL8B2x7qrISJg7IY2ZTPxFk=",
 	    "title": "Credentials Plugin",
 	    "url": "credentials.hpi",
 	    "version": "1.27",