[JENKINS-15829] Verified fix with test (see #50).

jenkinsci · Feb 12, 2014 · 36ac77a · 36ac77a · blt04 · Feb 13, 2014
1 parent 10b20d7
commit 36ac77a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/src/test/java/hudson/plugins/mercurial/SCMTestBase.java b/src/test/java/hudson/plugins/mercurial/SCMTestBase.java
@@ -51,6 +51,15 @@ public abstract class SCMTestBase {
 
     protected abstract String hgInstallation();
 
+    protected void assertClone(String log, boolean cloneExpected) {
+        if (cloneExpected) {
+            assertTrue(log, log.contains(" clone --"));
+        } else {
+            assertTrue(log, log.contains(" update --"));
+            assertFalse(log, log.contains(" clone --"));
+        }
+    }
+
     @Bug(13329)
     @Test public void basicOps() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
@@ -60,11 +69,25 @@ public abstract class SCMTestBase {
         m.hg(repo, "init");
         m.touchAndCommit(repo, "a");
         String log = m.buildAndCheck(p, "a");
-        assertTrue(log, log.contains(" clone --"));
+        assertClone(log, true);
+        m.touchAndCommit(repo, "b");
+        log = m.buildAndCheck(p, "b");
+        assertClone(log, false);
+    }
+
+    @Bug(15829)
+    @Test public void basicOpsSlave() throws Exception {
+        FreeStyleProject p = j.createFreeStyleProject();
+        p.setScm(new MercurialSCM(hgInstallation(), repo.getPath(), null, null,
+                null, null, false));
+        p.setAssignedNode(j.createOnlineSlave());
+        m.hg(repo, "init");
+        m.touchAndCommit(repo, "a");
+        String log = m.buildAndCheck(p, "a");
+        assertClone(log, true);
         m.touchAndCommit(repo, "b");
         log = m.buildAndCheck(p, "b");
-        assertTrue(log, log.contains(" update --"));
-        assertFalse(log, log.contains(" clone --"));
+        assertClone(log, false);
     }
 
     @Bug(4281)

diff --git a/src/test/java/hudson/plugins/mercurial/SharingSCMTest.java b/src/test/java/hudson/plugins/mercurial/SharingSCMTest.java
@@ -3,6 +3,7 @@
 import hudson.tools.ToolProperty;
 
 import java.util.Collections;
+import static org.junit.Assert.*;
 import org.junit.Before;
 
 public class SharingSCMTest extends SCMTestBase {
@@ -24,4 +25,13 @@ public class SharingSCMTest extends SCMTestBase {
         return SHARING_INSTALLATION;
     }
 
+    @Override protected void assertClone(String log, boolean cloneExpected) {
+        if (cloneExpected) {
+            assertTrue(log, log.contains(" share --"));
+        } else {
+            assertTrue(log, log.contains(" update --"));
+            assertFalse(log, log.contains(" share --"));
+        }
+    }
+
 }