[SCM-775] Fixed missed err output failure. Added additional test case.

apache · May 31, 2015 · bf98f96 · bf98f96
1 parent 5a9b53b
commit bf98f96
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.../src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java b/.../src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
@@ -142,7 +142,7 @@ protected CheckInScmResult executeCheckInCommand( ScmProviderRepository reposito
                     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,

diff --git a/...rc/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java b/...rc/test/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommandTest.java
@@ -514,4 +514,14 @@ public void testServerUnreachable2()
     	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." );
+
+    }
 }