brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/2] brooklyn-library git commit: Put back GeoDNS tests
Date Thu, 11 May 2017 09:54:43 GMT
Repository: brooklyn-library
Updated Branches:
  refs/heads/master 96369c9bc -> 3a853d622


Put back GeoDNS tests


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/0e0e895e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/0e0e895e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/0e0e895e

Branch: refs/heads/master
Commit: 0e0e895ea5042292468ca4a55043eb636c436c59
Parents: 905eb16
Author: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Authored: Thu May 11 10:26:18 2017 +0100
Committer: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Committed: Thu May 11 10:26:18 2017 +0100

----------------------------------------------------------------------
 .../brooklyn/entity/dns/AbstractGeoDnsServiceTest.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/0e0e895e/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
index 9a90b6c..7b4d37f 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
@@ -167,7 +167,7 @@ public class AbstractGeoDnsServiceTest extends BrooklynAppUnitTestSupport
{
                 .configure("longitude", lon);
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testGeoInfoOnLocation() {
         app.start( ImmutableList.of(westChildWithLocation, eastChildWithLocationAndWithPrivateHostname)
);
         publishSensors(2, true, true, true);
@@ -177,7 +177,7 @@ public class AbstractGeoDnsServiceTest extends BrooklynAppUnitTestSupport
{
         assertIsTarget("East child with location");
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testGeoInfoOnParentLocation() {
         app.start( ImmutableList.of(westChild, eastChild) );
         publishSensors(2, true, false, false);
@@ -187,7 +187,7 @@ public class AbstractGeoDnsServiceTest extends BrooklynAppUnitTestSupport
{
         assertIsTarget("East child");
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testSubscribesToHostname() {
         geoDns.config().set(GeoDnsTestServiceImpl.ADD_ANYTHING, false);
         app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname)
);
@@ -219,7 +219,7 @@ public class AbstractGeoDnsServiceTest extends BrooklynAppUnitTestSupport
{
         }
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testChildAddedLate() {
         app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname)
);
         publishSensors(2, true, false, false);
@@ -238,7 +238,7 @@ public class AbstractGeoDnsServiceTest extends BrooklynAppUnitTestSupport
{
         log.info("targets: "+geoDns.getTargetHostsByName());
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testFiltersEntirelyPrivate() {
         geoDns.config().set(GeoDnsTestServiceImpl.ADD_ANYTHING, false);
         app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname,
northChildWithLocation) );
@@ -276,7 +276,7 @@ public class AbstractGeoDnsServiceTest extends BrooklynAppUnitTestSupport
{
         assertAttributeEventually(geoDns, AbstractGeoDnsService.TARGETS, CollectionFunctionals.<String>mapSizeEquals(2));
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testCanDisableFilterForRunningEntities() throws Exception {
         geoDns.config().set(AbstractGeoDnsService.FILTER_FOR_RUNNING, false);
         app.start(ImmutableList.of(westChildWithLocation, eastChildWithLocationAndWithPrivateHostname));


Mime
View raw message