Browse files

Merge remote-tracking branch 'origin/master' into squash-o-matic-output

  • Loading branch information...
2 parents 0c79e42 + 617c9d8 commit a7383ca156cc01eeb7a1d5b87422d26854a7a0a9 @cstamas cstamas committed Nov 13, 2012
View
2 ...ncher/src/main/java/org/sonatype/nexus/integrationtests/AbstractNexusIntegrationTest.java
@@ -443,7 +443,7 @@ protected void runOnce()
protected File getNexusLogFile()
{
- return new File( "target/logs/" + getTestId() + "/nexus.log" );
+ return new File( nexusLogDir + "/" + getTestId() + "/nexus.log" );
}
protected void beforeStartClean()
View
8 ...ite-support/src/main/java/org/sonatype/nexus/testsuite/support/NexusRunningITSupport.java
@@ -111,18 +111,20 @@ public void beforeTestIsRunning()
);
}
- assertThat( "Nexus is running before test starts", nexus().isRunning(), is( true ) );
+ assertThat( "Nexus was not in running state", nexus().isRunning() );
logRemoteThatTestIs( "STARTING" );
}
@After
public void afterTestWasRunning()
{
- logRemoteThatTestIs( "FINISHED" );
-
if ( nexus != null )
{
+ if ( nexus.isRunning() )
+ {
+ logRemoteThatTestIs( "FINISHED" );
+ }
testIndex().recordLink( "wrapper.log", new File( nexus.getNexusDirectory(), "logs/wrapper.log" ) );
testIndex().recordLink( "nexus.log", new File( nexus.getWorkDirectory(), "logs/nexus.log" ) );
}

0 comments on commit a7383ca

Please sign in to comment.