Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixing reservation in master.
Related to the Issue JENKINS-17444.
Added a Test Case too.
"WARNING: Failed to timeout a reservation of 1234 on node !" was caused
by trying to access the master node with his name. 
getNodeName() in master, returns "" and cannot be found with
Hudson.getInstance().getNode(nodeName);
  • Loading branch information
arleyristar committed Jan 6, 2014
1 parent 52a8269 commit 4686f2e
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 1 deletion.
Expand Up @@ -24,14 +24,18 @@
*/
package com.sonyericsson.jenkins.plugins.externalresource.dispatcher.cli;

import jenkins.model.Jenkins;

import com.sonyericsson.jenkins.plugins.externalresource.dispatcher.data.ExternalResource;
import com.sonyericsson.jenkins.plugins.externalresource.dispatcher.utils.AvailabilityFilter;

import hudson.model.Hudson;
import hudson.model.Node;
import net.sf.json.JSON;
import net.sf.json.JSONException;
import net.sf.json.JSONObject;
import net.sf.json.JSONSerializer;

import org.kohsuke.args4j.CmdLineException;

/**
Expand All @@ -51,7 +55,12 @@ public final class ErCliUtils {
* @throws CmdLineException if no node or resource could be found.
*/
public static ExternalResource findExternalResource(String nodeName, String id) throws CmdLineException {
Node node = Hudson.getInstance().getNode(nodeName);
Node node = null;
if (nodeName.isEmpty()) {
node = Jenkins.getInstance();
} else {
node = Hudson.getInstance().getNode(nodeName);
}
if (node != null) {
ExternalResource resource = AvailabilityFilter.getInstance().getExternalResourceById(node, id);
if (resource != null) {
Expand Down
@@ -0,0 +1,93 @@
/*
* The MIT License
*
* Copyright 2011 Sony Ericsson Mobile Communications. All rights reserved.
* Copyright 2012 Sony Mobile Communications AB. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.sonyericsson.jenkins.plugins.externalresource.dispatcher.utils;

import com.sonyericsson.hudson.plugins.metadata.model.MetadataNodeProperty;
import com.sonyericsson.hudson.plugins.metadata.model.values.MetadataValue;
import com.sonyericsson.hudson.plugins.metadata.model.values.TreeStructureUtil;
import com.sonyericsson.jenkins.plugins.externalresource.dispatcher.PluginImpl;
import com.sonyericsson.jenkins.plugins.externalresource.dispatcher.data.ExternalResource;
import com.sonyericsson.jenkins.plugins.externalresource.dispatcher.data.StashInfo;
import com.sonyericsson.jenkins.plugins.externalresource.dispatcher.data.StashResult;

import hudson.model.Node;
import hudson.model.labels.LabelAtom;
import hudson.slaves.DumbSlave;
import hudson.tasks.Mailer;

import org.jvnet.hudson.test.HudsonTestCase;

import java.util.LinkedList;

import jenkins.model.Jenkins;

//CS IGNORE LineLength FOR NEXT 6 LINES. REASON: JavaDoc.

/**
* Tests for
* {@link com.sonyericsson.jenkins.plugins.externalresource.dispatcher.utils.resourcemanagers.ExternalResourceManager.NoopExternalResourceManager}.
*
* @author Robert Sandell <robert.sandell@sonyericsson.com>
*/
public class NoopExternalResourceManagerJenkinsTest extends HudsonTestCase {

//CS IGNORE MagicNumber FOR NEXT 200 LINES. REASON: Test Data.

private Node master;
private MetadataNodeProperty property;
private ExternalResource resource;

@Override
protected void setUp() throws Exception {
super.setUp();
master = Jenkins.getInstance();
property = new MetadataNodeProperty((new LinkedList<MetadataValue>()));
master.getNodeProperties().add(property);
resource = new ExternalResource("TestDevice", "description", "1", true,
new LinkedList<MetadataValue>());
TreeStructureUtil.addValue(resource, "yes", "description", "is", "matching");
TreeStructureUtil.addValue(property, resource, "attached-devices", "test");
Mailer.descriptor().setHudsonUrl(this.getURL().toString());
}

//CS IGNORE LineLength FOR NEXT 6 LINES. REASON: JavaDoc.
/**
* Tests
* {@link com.sonyericsson.jenkins.plugins.externalresource.dispatcher.utils.resourcemanagers.ExternalResourceManager.NoopExternalResourceManager
* #reserve(hudson.model.Node, com.sonyericsson.jenkins.plugins.externalresource.dispatcher.data.ExternalResource, int)}.
* That a resource reservation times out after the specified interval.
*/
public void testReserve() {
StashResult result = PluginImpl.getNoopResourceManager().reserve(master, resource, 1, "me");
assertTrue(result.isOk());
assertFalse(resource.isAvailable());
try {
Thread.sleep(1500);
} catch (InterruptedException e) {
fail();
}
assertNull(resource.getReserved());
}
}

0 comments on commit 4686f2e

Please sign in to comment.