You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ch...@apache.org on 2015/05/31 13:55:23 UTC
maven-scm git commit: [SCM-775] Fixed missed err output failure.
Added additional test case.
Repository: maven-scm
Updated Branches:
refs/heads/master 5a9b53bac -> bf98f96fa
[SCM-775] Fixed missed err output failure. Added additional test case.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/bf98f96f
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/bf98f96f
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/bf98f96f
Branch: refs/heads/master
Commit: bf98f96fa2c4a83ab37fa5de053e6740d30a705b
Parents: 5a9b53b
Author: Chris Graham <ch...@apache.org>
Authored: Sun May 31 21:43:24 2015 +1000
Committer: Chris Graham <ch...@apache.org>
Committed: Sun May 31 21:43:24 2015 +1000
----------------------------------------------------------------------
.../provider/jazz/command/checkin/JazzCheckInCommand.java | 2 +-
.../jazz/command/status/JazzStatusCommandTest.java | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/bf98f96f/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
index 7c34b7c..fddf196 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
@@ -142,7 +142,7 @@ public class JazzCheckInCommand
errConsumer = new ErrorConsumer( getLogger() );
status = changesetAssociateCmd.execute( outputConsumer, errConsumer );
- if ( status != 0 || errConsumer.hasBeenFed() )
+ if ( status != 0 )
{
return new CheckInScmResult( changesetAssociateCmd.getCommandString(),
"Error code for Jazz SCM changeset associate command - " + status,
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/bf98f96f/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java
index 41d612c..0bd8de4 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java
@@ -514,4 +514,14 @@ public class JazzStatusCommandTest
statusConsumer.consumeLine( " administrator." );
}
+
+ public void testServerUnreachable3()
+ {
+ statusConsumer.consumeLine( "Workspace: (----) \"Chris-Project-XXXXXX-Workspace\" (This workspace is unreachable.)" );
+ statusConsumer.consumeLine( " Could not determine the URI required to connect to the repository. The UUID of" );
+ statusConsumer.consumeLine( " the repository is _ZdjnafkjnEmkEW5-4HuDag. If you know the repository URI run" );
+ statusConsumer.consumeLine( " 'login' command providing the repository URI. If not, please contact your" );
+ statusConsumer.consumeLine( " administrator." );
+
+ }
}