From f4ec2bb63cf46a9488340a1cbfd5e189ee691db7 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <gaul@apache.org>
Date: Sun, 31 Jul 2022 20:08:27 +0900
Subject: [PATCH] Address testng cyclic dependency

Uncovered by newer versions of testng.
---
 .../integration/internal/BaseBlobIntegrationTest.java          | 2 +-
 .../integration/internal/BaseBlobStoreIntegrationTest.java     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
index a814c00b79..d885f4530e 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
@@ -104,7 +104,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
    private static final ByteSource oneHundredOneConstitutions = TestUtils.randomByteSource().slice(0, 101 * 45118);
 
-   @BeforeClass(groups = { "integration", "live" }, dependsOnMethods = "setupContext")
+   @BeforeClass(groups = { "integration", "live" })
    @Override
    public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception {
       super.setUpResourcesOnThisThread(testContext);
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
index 009e8fc861..7adbab703c 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
@@ -115,7 +115,6 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont
 
    @AfterSuite(groups = { "integration", "live" })
    protected void destroyResources() throws Exception {
-      setupContext();
       deleteEverything(view);
 
       view.close();
@@ -134,7 +133,7 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont
     * want to have a different implementation of context.getBlobStore(). For example, one class may
     * want non-blocking i/o and another class google appengine.
     */
-   @BeforeClass(groups = { "integration", "live" }, dependsOnMethods = "setupContext")
+   @BeforeClass(groups = { "integration", "live" })
    public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception {
       exec = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
    }