changeset 936:68160fb667b1

TW-43138 Report specific reason if agent side checkout is not possible due to complex checkout rules
author Dmitry.Treskunov@UNIT-412.Labs.IntelliJ.Net
date Wed, 11 Nov 2015 22:10:29 +0300
parents eb3e0285ae52
children ecf83680273e
files mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java	Wed Nov 11 21:03:31 2015 +0300
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java	Wed Nov 11 22:10:29 2015 +0300
@@ -70,7 +70,7 @@
       }
       return AgentCheckoutAbility.canCheckout();
     } catch (VcsException e) {
-      return AgentCheckoutAbility.canNotCheckout(e.getMessage());
+      return AgentCheckoutAbility.notSupportedCheckoutRules(e.getMessage());
     }
   }
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Wed Nov 11 21:03:31 2015 +0300
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Wed Nov 11 22:10:29 2015 +0300
@@ -117,7 +117,8 @@
 
     AgentCheckoutAbility agentCheckoutAbility = myVcsSupport.canCheckout(root, new CheckoutRules("+:subdir=>subdir2"), myContext.mock(AgentRunningBuild.class, "build" + myBuildCounter++));
 
-    assertThat(agentCheckoutAbility.getCanNotCheckoutReason().describe(true), containsString("Invalid include rule: subdir=>subdir2"));
+    assertThat(agentCheckoutAbility.getCanNotCheckoutReason().getType(), CoreMatchers.equalTo(AgentCheckoutAbility.NOT_SUPPORTED_CHECKOUT_RULES));
+    assertThat(agentCheckoutAbility.getCanNotCheckoutReason().getDetails(), containsString("Invalid include rule: subdir=>subdir2"));
   }
 
   public void checkout_on_agent() throws IOException, VcsException {