x
/
gearman-plugin
Code Issues Proposed changes

new tests for registerJobs method 

This commit adds tests to verify registering of gearman jobs.
Most of the single label scenarios are tested, however due to
weirdness with the HudsonTestCase class the multiple label
scenarios don't work the same as in normal Jenkins operation so
I could not create automated test for it.

Change-Id: I2e2ac5c51efd13d560c575310da4b8f8fb58f05b
This commit is contained in:
zaro0508 2013-03-22 10:22:25 -07:00
parent 307a674a12
commit ea235fd8de
3 changed files with 254 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/hudson/plugins/gearman/ExecutorWorkerThread.java
View File

@ -48,11 +48,6 @@ public class ExecutorWorkerThread extends AbstractWorkerThread{
private final Node node;
// constructor
public ExecutorWorkerThread(String host, int port, Node node) {
super(host, port);
this.node = node;
}
public ExecutorWorkerThread(String host, int port, String name, Node node) {
super(host, port, name);
this.node = node;

254
src/test/java/hudson/plugins/gearman/ExecutorWorkerThreadTest.java Normal file
View File

@ -0,0 +1,254 @@
/*
*
* Copyright 2013 Hewlett-Packard Development Company, L.P.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package hudson.plugins.gearman;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import hudson.maven.MavenModuleSet;
import hudson.model.Project;
import hudson.model.labels.LabelAtom;
import hudson.slaves.DumbSlave;
import java.util.Set;
import org.gearman.common.GearmanNIOJobServerConnection;
import org.gearman.worker.GearmanWorker;
import org.gearman.worker.GearmanWorkerImpl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.jvnet.hudson.test.HudsonTestCase;
import org.powermock.core.classloader.annotations.PrepareForTest;
/**
* Test for the {@link ExecutorWorkerThread} class.
*
* @author Khai Do
*/
@PrepareForTest(GearmanWorkerImpl.class)
public class ExecutorWorkerThreadTest extends HudsonTestCase {
DumbSlave slave = null;
@Before
public void setUpTest() throws Exception {
// mock out GearmanWorker
GearmanWorker gearmanWorker = mock(GearmanWorker.class);
GearmanNIOJobServerConnection conn = new GearmanNIOJobServerConnection("localhost", 4730);
doNothing().when(gearmanWorker).work();
doNothing().when(gearmanWorker).unregisterAll();
when(gearmanWorker.addServer(conn)).thenReturn(true);
}
@After
public void tearDownTest() {
}
/*
* This test verifies that gearman functions are correctly registered for a
* project that contains a label matching a slave node's self label
*/
@Test
public void testRegisterJobs_NodeSelfLabel() throws Exception {
slave = createOnlineSlave(new LabelAtom("oneiric-10"));
DumbSlave slave = createOnlineSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
Project<?, ?> apple = createFreeStyleProject("apple");
apple.setAssignedLabel(new LabelAtom("oneiric-10"));
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(2, functions.size());
assertTrue(functions.contains("build:apple"));
assertTrue(functions.contains("build:apple:oneiric-10"));
}
/*
* This test verifies that gearman functions are correctly registered for a
* project that contains a single label matching a label on the slave node
*/
@Test
public void testRegisterJobs_ProjectSingleLabel() throws Exception {
DumbSlave slave = createOnlineSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
Project<?, ?> lemon = createFreeStyleProject("lemon");
lemon.setAssignedLabel(new LabelAtom("linux"));
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(2, functions.size());
assertTrue(functions.contains("build:lemon"));
assertTrue(functions.contains("build:lemon:linux"));
}
/*
* This test verifies that no gearman functions are registered
* for projects that contain labels that do not match labels on a slave node
*/
@Test
public void testRegisterJobs_ProjectInvalidLabel() throws Exception {
DumbSlave slave = createOnlineSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
Project<?, ?> lemon = createFreeStyleProject("lemon");
lemon.setAssignedLabel(new LabelAtom("bogus"));
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(0, functions.size());
}
/*
* This test verifies that gearman functions correctly registered for a
* project that contains no labels
*/
@Test
public void testRegisterJobs_ProjectNoLabel() throws Exception {
DumbSlave slave = createOnlineSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
Project<?, ?> lemon = createFreeStyleProject("lemon");
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(1, functions.size());
assertTrue(functions.contains("build:lemon"));
}
/*
* This test verifies that no gearman functions are registered
* for disabled projects.
*/
@Test
public void testRegisterJobs_ProjectDisabled() throws Exception {
DumbSlave slave = createOnlineSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
Project<?, ?> lemon = createFreeStyleProject("lemon");
lemon.setAssignedLabel(new LabelAtom("linux"));
lemon.disable();
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(0, functions.size());
}
/*
* This test verifies that no gearman functions are registered
* for slaves nodes that are offline.
*/
@Test
public void testRegisterJobs_SlaveOffline() throws Exception {
DumbSlave slave = createSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
Project<?, ?> lemon = createFreeStyleProject("lemon");
lemon.setAssignedLabel(new LabelAtom("linux"));
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(0, functions.size());
}
/*
* This test verifies that gearman functions is correctly registered
* for maven projects
*/
@Test
public void testRegisterJobs_MavenProject() throws Exception {
DumbSlave slave = createOnlineSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
MavenModuleSet lemon = createMavenProject("lemon");
lemon.setAssignedLabel(new LabelAtom("linux"));
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(2, functions.size());
assertTrue(functions.contains("build:lemon"));
assertTrue(functions.contains("build:lemon:linux"));
}
/*
* This test verifies that gearman functions are correctly registered for a
* project that contains a label that has a negate operator
*/
@Test
public void testRegisterJobs_ProjectNotLabel() throws Exception {
DumbSlave slave = createOnlineSlave(new LabelAtom("oneiric-10"));
slave.setLabelString("ubuntu gcc python-2.4 linux");
Project<?, ?> lemon = createFreeStyleProject("lemon");
lemon.setAssignedLabel(new LabelAtom("!linux"));
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave);
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
hudson.removeNode(slave);
assertEquals(0, functions.size());
}
}

2
src/test/java/hudson/plugins/gearman/GearmanPluginConfigTest.java
View File

@ -26,7 +26,6 @@ import jenkins.model.Jenkins;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -47,7 +46,6 @@ public class GearmanPluginConfigTest {
*/
@Before
public void setUp() {
TemporaryFolder folder = new TemporaryFolder();
Jenkins jenkins = mock(Jenkins.class);
PowerMockito.mockStatic(Jenkins.class);
when(Jenkins.getInstance()).thenReturn(jenkins);