brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [1/2] brooklyn-library git commit: Fix GeoDNS tests
Date Wed, 10 May 2017 14:57:25 GMT
Repository: brooklyn-library
Updated Branches:
  refs/heads/master 6caaad48c -> 96369c9bc


Fix 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/905eb16b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/905eb16b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/905eb16b

Branch: refs/heads/master
Commit: 905eb16b81493c3f266726878dbd461a8716c39c
Parents: 6caaad4
Author: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Authored: Wed May 10 15:31:50 2017 +0100
Committer: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Committed: Wed May 10 15:31:50 2017 +0100

----------------------------------------------------------------------
 .../entity/dns/AbstractGeoDnsServiceTest.java         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/905eb16b/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 0f65d2b..9a90b6c 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
@@ -166,8 +166,8 @@ public class AbstractGeoDnsServiceTest extends BrooklynAppUnitTestSupport
{
                 .configure("latitude", lat)
                 .configure("longitude", lon);
     }
-    
-    @Test
+
+    @Test(groups="Integration")
     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
+    @Test(groups="Integration")
     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
+    @Test(groups="Integration")
     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
+    @Test(groups="Integration")
     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
+    @Test(groups="Integration")
     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
+    @Test(groups="Integration")
     public void testCanDisableFilterForRunningEntities() throws Exception {
         geoDns.config().set(AbstractGeoDnsService.FILTER_FOR_RUNNING, false);
         app.start(ImmutableList.of(westChildWithLocation, eastChildWithLocationAndWithPrivateHostname));


Mime
View raw message