Skip to content

Commit

Permalink
Fixed JENKINS-18107
Browse files Browse the repository at this point in the history
  • Loading branch information
@MadsNielsen
MadsNielsen committed Mar 5, 2014
1 parent 2a610b3 commit b81c08e
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 59 deletions.
16 changes: 10 additions & 6 deletions src/main/java/net/praqma/hudson/notifier/CCUCMNotifier.java
View file
Expand Up @@ -239,19 +239,23 @@ private void processBuild( AbstractBuild<?, ?> build, Launcher launcher, BuildLi
String name = NameTemplate.parseTemplate( pstate.getNameTemplate(), pstate );

targetbaseline = RemoteUtil.createRemoteBaseline( currentWorkspace, listener, name, pstate.getBaseline().getComponent(), action.getViewPath(), pstate.getBaseline().getUser() );
//At this point action can only be non-null.
action.setCreatedBaseline( targetbaseline );
action.setCreatedBaseline( targetbaseline );

} catch( Exception e ) {
ExceptionUtils.print( e, out, false );
logger.warning( "Failed to create baseline on stream" );
logger.log( Level.WARNING, "", e );
/* We cannot recommend a baseline that is not created */
if( pstate.doRecommend() ) {
out.println( String.format( "%s Cannot recommend Baseline when not created", logShortPrefix ) );
//out.println( "[" + Config.nameShort + "] Cannot recommend Baseline when not created" );
}

out.println( String.format( "%s Cannot recommend Baseline when not created", logShortPrefix ) );
}

//JENKINS-18107
if( pstate.getPolling().isPollingSelf() && pstate.doCreateBaseline() ) {
out.println("You cannot create a baseline in poll self mode.");
logger.warning("You cannot create a baseline in poll self mode.");
}

/* Set unstable? */
logger.warning( "Failing build because baseline could not be created" );
build.setResult( Result.FAILURE );
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/net/praqma/hudson/scm/ChangeLogParserImpl.java
View file
Expand Up @@ -24,14 +24,11 @@
*/
public class ChangeLogParserImpl extends ChangeLogParser {

protected static Logger logger = Logger.getLogger( ChangeLogParserImpl.class.getName() );
protected static final Logger logger = Logger.getLogger( ChangeLogParserImpl.class.getName() );

@Override
public ChangeLogSet<? extends Entry> parse( AbstractBuild build, File changelogFile ) throws IOException, SAXException {
List<ChangeLogEntryImpl> entries = new ArrayList<ChangeLogEntryImpl>();

// Source: http://wiki.hudson-ci.org/display/HUDSON/Change+log

Digester digester = new Digester2();
digester.push( entries );
digester.addObjectCreate( "*/entry/activity", ChangeLogEntryImpl.class );
Expand All @@ -42,6 +39,7 @@ public ChangeLogSet<? extends Entry> parse( AbstractBuild build, File changelogF
digester.addBeanPropertySetter( "*/entry/activity/author", "myAuthor" );
digester.addSetNext( "*/entry/activity", "add" );
FileReader reader = new FileReader( changelogFile );

try {
digester.parse( reader );
} catch( Exception e ) {
Expand Down
23 changes: 0 additions & 23 deletions src/main/java/net/praqma/hudson/scm/Environment.java
View file

This file was deleted.

1 change: 1 addition & 0 deletions src/main/java/net/praqma/hudson/scm/Unstable.java
View file
Expand Up @@ -37,6 +37,7 @@ public Type getType() {
return type;
}

@Override
public String toString() {
return type.toString();
}
Expand Down
39 changes: 13 additions & 26 deletions src/test/java/net/praqma/hudson/test/integration/self/Polling.java
View file
@@ -1,41 +1,29 @@
package net.praqma.hudson.test.integration.self;

import static org.junit.Assert.*;

import java.io.IOException;
import java.util.logging.Level;

import net.praqma.hudson.test.BaseTestClass;
import net.praqma.util.test.junit.LoggingRule;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.TestBuilder;
import org.mockito.Mockito;

import hudson.Launcher;
import hudson.model.AbstractBuild;
import hudson.model.BuildListener;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import hudson.model.Result;
import hudson.model.TaskListener;
import hudson.scm.PollingResult;
import net.praqma.clearcase.Environment;
import net.praqma.clearcase.test.annotations.ClearCaseUniqueVobName;
import net.praqma.clearcase.test.junit.ClearCaseRule;
import net.praqma.clearcase.ucm.entities.Baseline;
import net.praqma.clearcase.ucm.entities.Project.PromotionLevel;
import net.praqma.hudson.test.CCUCMRule;
import net.praqma.hudson.test.BaseTestClass;
import net.praqma.util.debug.Logger;
import static org.junit.Assert.*;
import org.junit.Rule;
import org.junit.Test;

public class Polling extends BaseTestClass {

@Rule
public ClearCaseRule ccenv = new ClearCaseRule( "ccucm" );

private static Logger logger = Logger.getLogger();

@Test
@ClearCaseUniqueVobName( name = "self-create-baseline")
public void testPollingNoChangesWithCreateBaselines() throws Exception {
FreeStyleProject project = jenkins.setupProject( "polling-test-with-baselines-" + ccenv.getUniqueName(), "self", "_System@" + ccenv.getPVob(), "one_int@" + ccenv.getPVob(), false, false, false, true );
PollingResult result = project.poll(jenkins.createTaskListener());
assertFalse(result.hasChanges());
}

@Test
@ClearCaseUniqueVobName( name = "self-changes" )
Expand All @@ -53,8 +41,7 @@ public void testPollingSelfWithBaselines() throws Exception {

assertTrue( result.hasChanges() );
}



public void testPollingSelfWithNoBaselines() throws Exception {
FreeStyleProject project = jenkins.setupProject( "polling-test-with-baselines-" + ccenv.getUniqueName(), "self", "_System@" + ccenv.getPVob(), "one_int@" + ccenv.getPVob(), false, false, false, false );

Expand Down

0 comments on commit b81c08e

Please sign in to comment.