Merge pull request #383 from Vlatombe/simplify-rate-limit-queue-check

`RateLimitBranchProperty`: Fix checking queue for other items tied to the same task

Author: jglick

src/main/java/jenkins/branch/RateLimitBranchProperty.java

@@ -537,7 +537,7 @@ public CauseOfBlockage canRun(Queue.Item item) {
                         return null;
                     }
                     for (Queue.Item i : items) {
-                        if (i.getId() < item.getId()) {
+                        if (i.getInQueueSince() < item.getInQueueSince()) {
                             LOGGER.log(Level.FINE, "{0} with queue id {1} blocked by queue id {2} was first",
                                     new Object[]{
                                             job.getFullName(),

src/test/java/jenkins/branch/RateLimitBranchPropertyTest.java

@@ -43,6 +43,7 @@
 import java.util.Collections;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.scm.impl.mock.MockSCMController;
 import jenkins.scm.impl.mock.MockSCMDiscoverBranches;
@@ -51,6 +52,7 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -84,6 +86,9 @@ public class RateLimitBranchPropertyTest {
      */
     @ClassRule
     public static JenkinsRule r = new JenkinsRule();
+
+    @ClassRule
+    public static LoggerRule loggerRule = new LoggerRule().record(RateLimitBranchProperty.class, Level.FINE);
     /**
      * Our logger.
      */