Skip to content

Fix GeoDNS tests #106

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

Merged
asfgit merged 1 commit into from
May 10, 2017
Merged

Fix GeoDNS tests #106

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
14 changes: 7 additions & 7 deletions software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ private LocationSpec<SshMachineLocation> newSshMachineLocationSpec(String name,
.configure("latitude", lat)
.configure("longitude", lon);
}
@Test

@Test(groups="Integration")
public void testGeoInfoOnLocation() {
app.start( ImmutableList.of(westChildWithLocation, eastChildWithLocationAndWithPrivateHostname) );
publishSensors(2, true, true, true);
Expand All @@ -177,7 +177,7 @@ public void testGeoInfoOnLocation() {
assertIsTarget("East child with location");
}

@Test
@Test(groups="Integration")
public void testGeoInfoOnParentLocation() {
app.start( ImmutableList.of(westChild, eastChild) );
publishSensors(2, true, false, false);
Expand All @@ -187,7 +187,7 @@ public void testGeoInfoOnParentLocation() {
assertIsTarget("East child");
}

@Test
@Test(groups="Integration")
public void testSubscribesToHostname() {
geoDns.config().set(GeoDnsTestServiceImpl.ADD_ANYTHING, false);
app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname) );
Expand Down Expand Up @@ -219,7 +219,7 @@ protected void publishSensors(int expectedSize, boolean includeServiceUp, boolea
}
}

@Test
@Test(groups="Integration")
public void testChildAddedLate() {
app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname) );
publishSensors(2, true, false, false);
Expand All @@ -238,7 +238,7 @@ public void testChildAddedLate() {
log.info("targets: "+geoDns.getTargetHostsByName());
}

@Test
@Test(groups="Integration")
public void testFiltersEntirelyPrivate() {
geoDns.config().set(GeoDnsTestServiceImpl.ADD_ANYTHING, false);
app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname, northChildWithLocation) );
Expand Down Expand Up @@ -276,7 +276,7 @@ public void testFiltersForRunningEntities() {
assertAttributeEventually(geoDns, AbstractGeoDnsService.TARGETS, CollectionFunctionals.<String>mapSizeEquals(2));
}

@Test
@Test(groups="Integration")
public void testCanDisableFilterForRunningEntities() throws Exception {
geoDns.config().set(AbstractGeoDnsService.FILTER_FOR_RUNNING, false);
app.start(ImmutableList.of(westChildWithLocation, eastChildWithLocationAndWithPrivateHostname));
Expand Down