Skip to content

Additional fix based on suggestion from mhardin #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Additional fix based on suggestion from mhardin #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/test/java/com/rmn/qa/AutomationCapabilityMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void testNodeNotInContext() {
AutomationCapabilityMatcher matcher = new AutomationCapabilityMatcher();
Map<String,Object> nodeCapability = new HashMap<String,Object>();
nodeCapability.put(CapabilityType.BROWSER_NAME,"firefox");
nodeCapability.put(AutomationConstants.INSTANCE_ID,"foobar");
nodeCapability.put(AutomationConstants.INSTANCE_ID,"foo");
Map<String,Object> testCapability = new HashMap<String,Object>();
testCapability.put(CapabilityType.BROWSER_NAME,"firefox");
AutomationDynamicNode node = new AutomationDynamicNode("uuid","id","browser","os", new Date(),10);
Expand Down Expand Up @@ -130,5 +130,7 @@ public void testPropertyDoesMatch() {
@After
public void clearSystemProperty() {
System.clearProperty(AutomationConstants.EXTRA_CAPABILITIES_PROPERTY_NAME);
// Also clear out the old AutomationRunContext
AutomationContext.refreshContext();
}
}
8 changes: 7 additions & 1 deletion src/test/java/com/rmn/qa/task/AutomationReaperTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Calendar;
import java.util.Date;

import org.junit.After;
import org.junit.Test;

import com.amazonaws.services.ec2.model.Instance;
Expand All @@ -18,13 +19,18 @@

public class AutomationReaperTaskTest {

@After
public void tearDown() {
AutomationContext.refreshContext();
}

@Test
public void testShutdown() {
MockVmManager ec2 = new MockVmManager();
Reservation reservation = new Reservation();
Instance instance = new Instance();
instance.setState(new InstanceState().withCode(10));
String instanceId = "foobar";
String instanceId = "foo";
instance.setInstanceId(instanceId);
instance.setLaunchTime(AutomationUtils.modifyDate(new Date(),-5,Calendar.HOUR));
reservation.setInstances(Arrays.asList(instance));
Expand Down