You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2022/08/03 12:24:18 UTC
[jclouds] branch master updated (16926b0bb7 -> 7fecb72e0d)
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
from 16926b0bb7 Upgrade to assertj 3.23.1
new 65e16c97f5 Annotate test methods as singleThreaded
new 2b217fb2bb Annotate public non-test methods
new 5111923566 Specify missing DataProviders
new f4ec2bb63c Address testng cyclic dependency
new 7fecb72e0d Upgrade to testng 7.5
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../chef/src/test/java/org/jclouds/chef/domain/RoleTest.java | 1 +
.../src/test/java/org/jclouds/chef/util/ChefUtilsTest.java | 2 +-
.../jclouds/ohai/functions/ByteArrayToMacAddressTest.java | 2 +-
.../org/jclouds/cloudstack/parse/ListHostsResponseTest.java | 2 ++
.../integration/FilesystemBlobIntegrationTest.java | 10 ++++++++++
.../strategy/internal/FilesystemStorageStrategyImplTest.java | 2 +-
apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java | 2 +-
.../functions/ParseSystemAndUserMetadataFromHeadersTest.java | 2 +-
.../integration/internal/BaseBlobIntegrationTest.java | 2 +-
.../integration/internal/BaseBlobSignerLiveTest.java | 2 ++
.../integration/internal/BaseBlobStoreIntegrationTest.java | 3 +--
.../integration/internal/BaseContainerIntegrationTest.java | 12 ++++++++++++
core/src/test/java/org/jclouds/crypto/PemsTest.java | 2 +-
.../src/test/java/org/jclouds/functions/JoinOnCommaTest.java | 2 +-
.../test/java/org/jclouds/http/internal/WireLiveTest.java | 2 +-
core/src/test/java/org/jclouds/http/internal/WireTest.java | 2 +-
project/pom.xml | 4 ++--
.../ElasticHostsPeer1LosAngelesComputeServiceLiveTest.java | 2 +-
.../ElasticHostsPeer1LondonComputeServiceLiveTest.java | 2 +-
.../ElasticHostsPeer1SanAntonioComputeServiceLiveTest.java | 2 +-
.../ElasticHostsPeer1TorontoComputeServiceLiveTest.java | 2 +-
.../compute/Go2CloudJohannesburg1ComputeServiceLiveTest.java | 2 +-
.../compute/OpenHostingEast1ComputeServiceLiveTest.java | 2 +-
.../compute/ServerloveManchesterComputeServiceLiveTest.java | 2 +-
.../compute/SkaliCloudMalaysiaComputeServiceLiveTest.java | 2 +-
25 files changed, 48 insertions(+), 22 deletions(-)
[jclouds] 05/05: Upgrade to testng 7.5
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 7fecb72e0d591038ed284ca1930446279c364089
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sun Jul 31 19:12:29 2022 +0900
Upgrade to testng 7.5
Requires upgrading surefire as well.
---
project/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/project/pom.xml b/project/pom.xml
index 496bde09df..8b67af1e8c 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -218,7 +218,7 @@
<!-- Plugin versions -->
<bnd.version>5.2.0</bnd.version>
<maven-jar-plugin.version>3.0.1</maven-jar-plugin.version>
- <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<!-- General dependency versions -->
<gson.version>2.8.9</gson.version>
@@ -243,7 +243,7 @@
<osgi.version>6.0.0</osgi.version>
<!-- Test dependency versions -->
- <testng.version>6.8.21</testng.version>
+ <testng.version>7.5</testng.version>
<xmlunit.version>1.3</xmlunit.version>
<assertj-core.version>3.23.1</assertj-core.version>
<assertj-guava.version>1.3.0</assertj-guava.version>
[jclouds] 01/05: Annotate test methods as singleThreaded
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 65e16c97f56b141ce8fdd00a5e75227a0146d77d
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sun Jul 31 19:19:52 2022 +0900
Annotate test methods as singleThreaded
Newer versions of testng deprecate sequential.
---
apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java | 2 +-
.../test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java | 2 +-
.../filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java | 2 +-
apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java | 2 +-
.../blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java | 2 +-
core/src/test/java/org/jclouds/crypto/PemsTest.java | 2 +-
core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java | 2 +-
core/src/test/java/org/jclouds/http/internal/WireLiveTest.java | 2 +-
core/src/test/java/org/jclouds/http/internal/WireTest.java | 2 +-
.../compute/ElasticHostsPeer1LosAngelesComputeServiceLiveTest.java | 2 +-
.../compute/ElasticHostsPeer1LondonComputeServiceLiveTest.java | 2 +-
.../compute/ElasticHostsPeer1SanAntonioComputeServiceLiveTest.java | 2 +-
.../compute/ElasticHostsPeer1TorontoComputeServiceLiveTest.java | 2 +-
.../go2cloud/compute/Go2CloudJohannesburg1ComputeServiceLiveTest.java | 2 +-
.../openhosting/compute/OpenHostingEast1ComputeServiceLiveTest.java | 2 +-
.../serverlove/compute/ServerloveManchesterComputeServiceLiveTest.java | 2 +-
.../skalicloud/compute/SkaliCloudMalaysiaComputeServiceLiveTest.java | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java b/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java
index 5f625f4a19..faefd789f6 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java
@@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList;
/**
* Tests behavior of {@code ChefUtils}
*/
-@Test(groups = { "unit" }, sequential = true)
+@Test(groups = { "unit" }, singleThreaded = true)
public class ChefUtilsTest {
public static long millis = 1280251180727L;
public static String millisString = "1280251180727";
diff --git a/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java b/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
index f736dad8c6..1c5345c7a6 100644
--- a/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
+++ b/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
/**
* Tests behavior of {@code ByteArrayToMacAddress}
*/
-@Test(groups = { "unit" }, sequential = true)
+@Test(groups = { "unit" }, singleThreaded = true)
public class ByteArrayToMacAddressTest {
public void test() {
diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java
index 33157ced6c..193a5a4e08 100644
--- a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java
+++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java
@@ -67,7 +67,7 @@ import com.google.common.util.concurrent.Uninterruptibles;
/**
* Test class for {@link FilesystemStorageStrategyImpl } class
*/
-@Test(groups = "unit", testName = "filesystem.FilesystemBlobUtilsTest", sequential = true)
+@Test(groups = "unit", testName = "filesystem.FilesystemBlobUtilsTest", singleThreaded = true)
public class FilesystemStorageStrategyImplTest {
private static final String CONTAINER_NAME = "funambol-test";
private static final String TARGET_CONTAINER_NAME = TestUtils.TARGET_BASE_DIR + CONTAINER_NAME;
diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
index 6cd1485ced..71824b5efe 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
@@ -51,7 +51,7 @@ import com.google.inject.Injector;
* Tests parsing of S3 responses
*/
// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "performance", sequential = true, timeOut = 2 * 60 * 1000, testName = "S3ParserTest")
+@Test(groups = "performance", singleThreaded = true, timeOut = 2 * 60 * 1000, testName = "S3ParserTest")
public class S3ParserTest extends PerformanceTest {
Injector injector = null;
ParseSax.Factory factory;
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
index a2ee1dc36c..47a27c224e 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
import com.google.common.net.HttpHeaders;
-@Test(sequential = true)
+@Test(singleThreaded = true)
public class ParseSystemAndUserMetadataFromHeadersTest {
private ParseSystemAndUserMetadataFromHeaders parser;
diff --git a/core/src/test/java/org/jclouds/crypto/PemsTest.java b/core/src/test/java/org/jclouds/crypto/PemsTest.java
index a60b58b7c3..fcb10b5eea 100644
--- a/core/src/test/java/org/jclouds/crypto/PemsTest.java
+++ b/core/src/test/java/org/jclouds/crypto/PemsTest.java
@@ -35,7 +35,7 @@ import com.google.common.io.ByteSource;
import org.testng.annotations.Test;
-@Test(groups = "unit", sequential = true)
+@Test(groups = "unit", singleThreaded = true)
public class PemsTest {
public static final String PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAKCAQEAyb2ZJJqGm0KKR+8nfQJNsSd+F9tXNMV7CfOcW6jsqs8EZgiV\nR09hD1IYOj4YqM0qJONlgyg4xRWewdSG7QTPj1lJpVAida9sXy2+kzyagZA1Am0O\nZcbqb5hoeIDgcX+eDa79s0u0DomjcfO9EKhvHLBz+zM+3QqPRkPV8nYTbfs+HjVz\nzOU6D1B0XR3+IPZZl2AnWs2d0qhnStHcDUvnRVQ0P482YwN9VgceOZtpPz0DCKEJ\n5Tx5STub8k0/zt/VAMHQafLSuQMLd2s4ZLuOZptN//uAsTmxireqd37z+8ZTdBbJ\n8LEpJ+iCXuSfm5aUh7iw6oxvToY2AL53+jK2UQIDAQABAoIBAQDA88B3i/xWn0vX\nBVxFamCYoecuNjGwXX [...]
diff --git a/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java b/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java
index f55bc05990..349dc0173f 100644
--- a/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java
+++ b/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
-@Test(groups = "unit", sequential = true)
+@Test(groups = "unit", singleThreaded = true)
public class JoinOnCommaTest {
@Test
public void testIterableLong() {
diff --git a/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java b/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java
index fd24226ebe..53eb028046 100644
--- a/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java
+++ b/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java
@@ -36,7 +36,7 @@ import org.jclouds.io.ByteStreams2;
import org.jclouds.logging.Logger;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true)
+@Test(groups = "live", singleThreaded = true)
public class WireLiveTest {
private static final String sysHttpStreamUrl = System.getProperty("jclouds.wire.httpstream.url");
diff --git a/core/src/test/java/org/jclouds/http/internal/WireTest.java b/core/src/test/java/org/jclouds/http/internal/WireTest.java
index 026cdff684..35146275fb 100644
--- a/core/src/test/java/org/jclouds/http/internal/WireTest.java
+++ b/core/src/test/java/org/jclouds/http/internal/WireTest.java
@@ -29,7 +29,7 @@ import java.io.InputStream;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;
-@Test(groups = "unit", sequential = true)
+@Test(groups = "unit", singleThreaded = true)
public class WireTest {
static class BufferLogger implements Logger {
diff --git a/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesComputeServiceLiveTest.java b/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesComputeServiceLiveTest.java
index 91f581a7a0..6e99df18f8 100644
--- a/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesComputeServiceLiveTest.java
+++ b/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.elastichosts.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "ElasticHostsPeer1LosAngelesComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "ElasticHostsPeer1LosAngelesComputeServiceLiveTest")
public class ElasticHostsPeer1LosAngelesComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public ElasticHostsPeer1LosAngelesComputeServiceLiveTest() {
diff --git a/providers/elastichosts-lon-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LondonComputeServiceLiveTest.java b/providers/elastichosts-lon-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LondonComputeServiceLiveTest.java
index 868d0b965a..911db0113e 100644
--- a/providers/elastichosts-lon-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LondonComputeServiceLiveTest.java
+++ b/providers/elastichosts-lon-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LondonComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.elastichosts.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "ElasticHostsPeer1LondonComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "ElasticHostsPeer1LondonComputeServiceLiveTest")
public class ElasticHostsPeer1LondonComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public ElasticHostsPeer1LondonComputeServiceLiveTest() {
diff --git a/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioComputeServiceLiveTest.java b/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioComputeServiceLiveTest.java
index 0fb822df35..a06912d30b 100644
--- a/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioComputeServiceLiveTest.java
+++ b/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.elastichosts.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "ElasticHostsPeer1SanAntonioComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "ElasticHostsPeer1SanAntonioComputeServiceLiveTest")
public class ElasticHostsPeer1SanAntonioComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public ElasticHostsPeer1SanAntonioComputeServiceLiveTest() {
diff --git a/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoComputeServiceLiveTest.java b/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoComputeServiceLiveTest.java
index 1971c31481..df7c15368d 100644
--- a/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoComputeServiceLiveTest.java
+++ b/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.elastichosts.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "ElasticHostsPeer1TorontoComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "ElasticHostsPeer1TorontoComputeServiceLiveTest")
public class ElasticHostsPeer1TorontoComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public ElasticHostsPeer1TorontoComputeServiceLiveTest() {
diff --git a/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1ComputeServiceLiveTest.java b/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1ComputeServiceLiveTest.java
index a64abc4ea6..bb9838263a 100644
--- a/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1ComputeServiceLiveTest.java
+++ b/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1ComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.go2cloud.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "Go2CloudJohannesburg1ComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "Go2CloudJohannesburg1ComputeServiceLiveTest")
public class Go2CloudJohannesburg1ComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public Go2CloudJohannesburg1ComputeServiceLiveTest() {
diff --git a/providers/openhosting-east1/src/test/java/org/jclouds/openhosting/compute/OpenHostingEast1ComputeServiceLiveTest.java b/providers/openhosting-east1/src/test/java/org/jclouds/openhosting/compute/OpenHostingEast1ComputeServiceLiveTest.java
index 65804b26f1..41a6442074 100644
--- a/providers/openhosting-east1/src/test/java/org/jclouds/openhosting/compute/OpenHostingEast1ComputeServiceLiveTest.java
+++ b/providers/openhosting-east1/src/test/java/org/jclouds/openhosting/compute/OpenHostingEast1ComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.openhosting.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "OpenHostingEast1ComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "OpenHostingEast1ComputeServiceLiveTest")
public class OpenHostingEast1ComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public OpenHostingEast1ComputeServiceLiveTest() {
diff --git a/providers/serverlove-z1-man/src/test/java/org/jclouds/serverlove/compute/ServerloveManchesterComputeServiceLiveTest.java b/providers/serverlove-z1-man/src/test/java/org/jclouds/serverlove/compute/ServerloveManchesterComputeServiceLiveTest.java
index 48aee5df6a..b60d34095d 100644
--- a/providers/serverlove-z1-man/src/test/java/org/jclouds/serverlove/compute/ServerloveManchesterComputeServiceLiveTest.java
+++ b/providers/serverlove-z1-man/src/test/java/org/jclouds/serverlove/compute/ServerloveManchesterComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.serverlove.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "ServerloveManchesterComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "ServerloveManchesterComputeServiceLiveTest")
public class ServerloveManchesterComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public ServerloveManchesterComputeServiceLiveTest() {
diff --git a/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaComputeServiceLiveTest.java b/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaComputeServiceLiveTest.java
index 046d01c6c3..17570d0502 100644
--- a/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaComputeServiceLiveTest.java
+++ b/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaComputeServiceLiveTest.java
@@ -19,7 +19,7 @@ package org.jclouds.skalicloud.compute;
import org.jclouds.elasticstack.compute.ElasticStackComputeServiceLiveTest;
import org.testng.annotations.Test;
-@Test(groups = "live", sequential = true, testName = "SkaliCloudMalaysiaComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "SkaliCloudMalaysiaComputeServiceLiveTest")
public class SkaliCloudMalaysiaComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public SkaliCloudMalaysiaComputeServiceLiveTest() {
[jclouds] 02/05: Annotate public non-test methods
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 2b217fb2bb0cfaf39c8f91c1402cdf438f806ee9
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sun Jul 31 19:29:29 2022 +0900
Annotate public non-test methods
Newer versions of TestNG try to run these.
---
apis/chef/src/test/java/org/jclouds/chef/domain/RoleTest.java | 1 +
.../test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java | 2 ++
.../jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java | 1 +
.../jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java | 2 ++
4 files changed, 6 insertions(+)
diff --git a/apis/chef/src/test/java/org/jclouds/chef/domain/RoleTest.java b/apis/chef/src/test/java/org/jclouds/chef/domain/RoleTest.java
index 59f92bf310..b5b5d3db09 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/domain/RoleTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/domain/RoleTest.java
@@ -107,6 +107,7 @@ public class RoleTest {
assertNotEquals(role2, role1, "role2 should not equal role1");
}
+ @Test(enabled = false)
public static void verifyRunListForEnvironment(Map<String, List<String>> envRunList, String envName,
String... expectedEntries) {
assertTrue(envRunList.containsKey(envName), "envRunList contains " + envName);
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java
index b4f5855cb3..58b91631be 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java
@@ -36,6 +36,8 @@ import com.google.inject.Injector;
@Test(groups = "unit")
public class ListHostsResponseTest extends BaseParserTest<Set<Host>, Set<Host>> {
+ @Override
+ @Test(enabled = false)
public void compare(Set<Host> expects, Set<Host> response) {
assertEquals(response.toString(), expects.toString());
}
diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
index 4219ef6d2f..a4ed63c694 100644
--- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
+++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
@@ -64,6 +64,7 @@ public class FilesystemBlobIntegrationTest extends BaseBlobIntegrationTest {
// Mac OS X HFS+ does not support UserDefinedFileAttributeView:
// https://bugs.openjdk.java.net/browse/JDK-8030048
@Override
+ @Test(enabled = false)
public void checkContentMetadata(Blob blob) {
if (!isMacOSX()) {
super.checkContentMetadata(blob);
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
index 8bacfbed4b..db74dddcf2 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
@@ -99,6 +99,7 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest {
}
}
+ @Test(enabled = false)
public void testSignGetUrlWithTime(final long timeout) throws InterruptedException, IOException {
String name = "hello";
String text = "fooooooooooooooooooooooo";
@@ -166,6 +167,7 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest {
}
}
+ @Test(enabled = false)
public void testSignPutUrlWithTime(final long timeout) throws InterruptedException, IOException {
String name = "hello";
String text = "fooooooooooooooooooooooo";
[jclouds] 03/05: Specify missing DataProviders
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 5111923566a9c5fc37529b5098a9a53806c04c0e
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sun Jul 31 20:08:17 2022 +0900
Specify missing DataProviders
Uncovered by newer versions of testng.
---
.../integration/FilesystemBlobIntegrationTest.java | 9 +++++++++
.../integration/internal/BaseContainerIntegrationTest.java | 12 ++++++++++++
2 files changed, 21 insertions(+)
diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
index a4ed63c694..2fa70014a8 100644
--- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
+++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
@@ -17,6 +17,8 @@
package org.jclouds.filesystem.integration;
import static org.jclouds.filesystem.util.Utils.isMacOSX;
+import static org.jclouds.utils.TestUtils.NO_INVOCATIONS;
+import static org.jclouds.utils.TestUtils.SINGLE_NO_ARG_INVOCATION;
import java.io.IOException;
import java.util.Arrays;
@@ -44,6 +46,7 @@ import org.jclouds.filesystem.reference.FilesystemConstants;
import org.jclouds.filesystem.utils.TestUtils;
import org.jclouds.io.Payload;
import org.jclouds.io.Payloads;
+import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.testng.SkipException;
@@ -205,4 +208,10 @@ public class FilesystemBlobIntegrationTest extends BaseBlobIntegrationTest {
throw new SkipException("filesystem does not support extended attributes in Mac OSX");
}
}
+
+ @DataProvider
+ public Object[][] ignoreOnMacOSX() {
+ return isMacOSX() ? NO_INVOCATIONS
+ : SINGLE_NO_ARG_INVOCATION;
+ }
}
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
index 0c7b50378b..f13ad6ce6c 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
@@ -24,6 +24,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.afterMarker;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.inDirectory;
import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults;
+import static org.jclouds.utils.TestUtils.NO_INVOCATIONS;
+import static org.jclouds.utils.TestUtils.SINGLE_NO_ARG_INVOCATION;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -790,4 +792,14 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest {
Uninterruptibles.sleepUninterruptibly(AWAIT_CONSISTENCY_TIMEOUT_SECONDS, TimeUnit.SECONDS);
}
}
+
+ @DataProvider
+ public Object[][] ignoreOnWindows() {
+ return isWindowsOs() ? NO_INVOCATIONS
+ : SINGLE_NO_ARG_INVOCATION;
+ }
+
+ private static boolean isWindowsOs() {
+ return System.getProperty("os.name", "").toLowerCase().contains("windows");
+ }
}
[jclouds] 04/05: Address testng cyclic dependency
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit f4ec2bb63cf46a9488340a1cbfd5e189ee691db7
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sun Jul 31 20:08:27 2022 +0900
Address testng cyclic dependency
Uncovered by newer versions of testng.
---
.../blobstore/integration/internal/BaseBlobIntegrationTest.java | 2 +-
.../blobstore/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());
}