Merged revisions 21368 via svnmerge from

https://svn.dev.java.net/svn/hudson/branches/rc

........
  r21368 | kohsuke | 2009-09-02 13:14:25 -0700 (Wed, 02 Sep 2009) | 33 lines
  
  wait until the channel terminates normally to avoid random test failures like this:
  
  junit.framework.AssertionFailedError: exit code should have been 0 expected:<0> but was:<255>
  	at junit.framework.Assert.fail(Assert.java:47)
  	at junit.framework.Assert.failNotEquals(Assert.java:285)
  	at junit.framework.Assert.assertEquals(Assert.java:64)
  	at junit.framework.Assert.assertEquals(Assert.java:201)
  	at hudson.remoting.ChannelRunner$Fork.stop(ChannelRunner.java:141)
  	at hudson.remoting.RmiTestBase.tearDown(RmiTestBase.java:53)
  	at junit.framework.TestCase.runBare(TestCase.java:130)
  	at junit.framework.TestResult$1.protect(TestResult.java:106)
  	at junit.framework.TestResult.runProtected(TestResult.java:124)
  	at junit.framework.TestResult.run(TestResult.java:109)
  	at junit.framework.TestCase.run(TestCase.java:118)
  	at junit.framework.TestSuite.runTest(TestSuite.java:208)
  	at junit.framework.TestSuite.run(TestSuite.java:203)
  	at junit.framework.TestSuite.runTest(TestSuite.java:208)
  	at junit.framework.TestSuite.run(TestSuite.java:203)
  	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
  	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
  	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
  	at java.lang.reflect.Method.invoke(Method.java:597)
  	at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)
  	at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
  	at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
  	at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
  	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
  	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
  	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
  	at java.lang.reflect.Method.invoke(Method.java:597)
  	at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
  	at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21371 71c3de6d-444a-0410-be80-ed276b4c234a

remoting/src/test/java/hudson/remoting/ChannelRunner.java

@@ -129,6 +129,7 @@ interface ChannelRunner {
 
         public void stop(Channel channel) throws Exception {
             channel.close();
+            channel.join(10*1000);
 
             System.out.println("north completed");