brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [2/3] git commit: convert integration tests requiring credentials to Live, with some also Live-sanity
Date Thu, 26 Jun 2014 12:25:00 GMT
convert integration tests requiring credentials to Live, with some also Live-sanity


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

Branch: refs/heads/master
Commit: bb4366126cc93512d9eda2dbe1bc5651bcd4cc0e
Parents: 8734efa
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Jun 26 11:52:21 2014 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Jun 26 12:39:19 2014 +0100

----------------------------------------------------------------------
 .../rebind/persister/jclouds/BlobStoreExpiryTest.java |  4 ++--
 .../rebind/persister/jclouds/BlobStoreTest.java       |  4 ++--
 ...rooklynMementoPersisterJcloudsObjectStoreTest.java |  6 +++---
 ...HighAvailabilityManagerJcloudsObjectStoreTest.java | 14 +++++++-------
 .../jclouds/JcloudsObjectStoreAccessorWriterTest.java |  8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bb436612/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
index b687104..19f56f7 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
@@ -45,13 +45,13 @@ import com.google.common.collect.ImmutableMap.Builder;
 import com.google.inject.Inject;
 import com.google.inject.Module;
 
-@Test(groups="Integration")
+@Test(groups={"Live", "Live-sanity"})
 public class BlobStoreExpiryTest {
 
     private static final Logger log = LoggerFactory.getLogger(BlobStoreExpiryTest.class);
     
     /**
-     * Integration tests as written require a location defined as follows:
+     * Live tests as written require a location defined as follows:
      * 
      * <code>
      * brooklyn.location.named.brooklyn-jclouds-objstore-test-1==jclouds:swift:https://ams01.objectstorage.softlayer.net/auth/v1.0

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bb436612/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
index d7bfae3..3fc02bc 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
@@ -27,11 +27,11 @@ import brooklyn.util.text.Identifiers;
 
 import com.google.common.base.Preconditions;
 
-@Test(groups="Integration")
+@Test(groups={"Live", "Live-sanity"})
 public class BlobStoreTest {
 
     /**
-     * Integration tests as written require a location defined as follows:
+     * Live tests as written require a location defined as follows:
      * 
      * <code>
      * brooklyn.location.named.brooklyn-jclouds-objstore-test-1==jclouds:swift:https://ams01.objectstorage.softlayer.net/auth/v1.0

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bb436612/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
index bd3e425..131bb51 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
@@ -17,7 +17,7 @@ import brooklyn.util.time.Duration;
 /**
  * @author Andrea Turli
  */
-@Test(groups="Integration")
+@Test(groups={"Live", "Live-sanity"})
 public class BrooklynMementoPersisterJcloudsObjectStoreTest extends BrooklynMementoPersisterTestFixture
{
 
     @Override @BeforeMethod
@@ -32,13 +32,13 @@ public class BrooklynMementoPersisterJcloudsObjectStoreTest extends BrooklynMeme
             .buildStarted();
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testCheckPointAndLoadMemento() throws IOException, TimeoutException, InterruptedException
{
         super.testCheckPointAndLoadMemento();
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testDeleteAndLoadMemento() throws TimeoutException, InterruptedException,
IOException {
         super.testDeleteAndLoadMemento();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bb436612/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
index 834cb13..865d19f 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
@@ -10,7 +10,7 @@ import brooklyn.management.internal.ManagementContextInternal;
 import brooklyn.test.entity.LocalManagementContextForTests;
 import brooklyn.util.text.Identifiers;
 
-@Test(groups="Integration")
+@Test(groups={"Live", "Live-sanity"})
 public class HighAvailabilityManagerJcloudsObjectStoreTest extends HighAvailabilityManagerTestFixture
{
 
     protected ManagementContextInternal newLocalManagementContext() {
@@ -25,36 +25,36 @@ public class HighAvailabilityManagerJcloudsObjectStoreTest extends HighAvailabil
             BlobStoreTest.PERSIST_TO_OBJECT_STORE_FOR_TEST_SPEC, BlobStoreTest.CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(4));
     }
 
-    @Test(groups="Integration", invocationCount=5) //run fewer times w softlayer... 
+    @Test(groups="Live", invocationCount=5) //run fewer times w softlayer... 
     public void testGetManagementPlaneStatusManyTimes() throws Exception {
         testGetManagementPlaneStatus();
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testDoesNotPromoteIfMasterTimeoutNotExpired() throws Exception {
         super.testDoesNotPromoteIfMasterTimeoutNotExpired();
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testGetManagementPlaneStatus() throws Exception {
         super.testGetManagementPlaneStatus();
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testPromotes() throws Exception {
         super.testPromotes();
     }
 
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testGetManagementPlaneSyncStateInfersTimedOutNodeAsFailed() throws Exception
{
         super.testGetManagementPlaneSyncStateInfersTimedOutNodeAsFailed();
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testGetManagementPlaneSyncStateDoesNotThrowNpeBeforePersisterSet() throws
Exception {
         super.testGetManagementPlaneSyncStateDoesNotThrowNpeBeforePersisterSet();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bb436612/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
index 6fc0b80..59cc087 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java
@@ -16,7 +16,7 @@ import brooklyn.management.ha.HighAvailabilityMode;
 import brooklyn.test.entity.LocalManagementContextForTests;
 import brooklyn.util.text.Identifiers;
 
-@Test(groups="Integration")
+@Test(groups={"Live", "Live-sanity"})
 public class JcloudsObjectStoreAccessorWriterTest extends PersistenceStoreObjectAccessorWriterTestFixture
{
 
     private JcloudsBlobStoreBasedObjectStore store;
@@ -47,19 +47,19 @@ public class JcloudsObjectStoreAccessorWriterTest extends PersistenceStoreObject
         return 10000;
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testWriteBacklogThenDeleteWillLeaveFileDeleted() throws Exception {
         super.testWriteBacklogThenDeleteWillLeaveFileDeleted();
     }
     
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testWritesFile() throws Exception {
         super.testWritesFile();
     }
 
-    @Test(groups="Integration")
+    @Test(groups={"Live", "Live-sanity"})
     @Override
     public void testLastModifiedTime() throws Exception {
         super.testLastModifiedTime();


Mime
View raw message