Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
2 changed files
with
103 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
...ins/plugins/externalresource/dispatcher/utils/NoopExternalResourceManagerJenkinsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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()); | ||
} | ||
} |