Skip to content

Commit 79c060f

Browse files
committed
ignore s3 select tests, new aws acconts dont support s3 select
1 parent 9bbd534 commit 79c060f

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed

tests/aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
#include <aws/core/client/RetryStrategy.h>
1212
#include <aws/core/http/HttpClientFactory.h>
1313
#include <aws/core/http/HttpClient.h>
14+
#include <aws/core/http/standard/StandardHttpRequest.h>
15+
#include <aws/core/monitoring/DefaultMonitoring.h>
16+
#include <aws/core/monitoring/CoreMetrics.h>
1417
#include <aws/core/utils/crypto/Cipher.h>
1518
#include <aws/core/utils/crypto/Factories.h>
1619
#include <aws/core/utils/DateTime.h>
@@ -50,9 +53,10 @@
5053
#pragma warning(disable: 4127)
5154
#endif //_WIN32
5255

53-
#include <aws/core/http/standard/StandardHttpRequest.h>
54-
#include <aws/core/monitoring/DefaultMonitoring.h>
55-
#include <aws/core/monitoring/CoreMetrics.h>
56+
#if defined(_WIN32)
57+
// disable "warning C4702: unreachable code" from GTEST_SKIP on newer MSVS
58+
#pragma warning(disable: 4702)
59+
#endif
5660

5761
using namespace Aws;
5862
using namespace Aws::Http::Standard;
@@ -980,6 +984,7 @@ namespace
980984

981985
TEST_F(BucketAndObjectOperationTest, TestObjectOperationWithEventStream)
982986
{
987+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
983988
Aws::String fullBucketName = CalculateBucketName(BASE_EVENT_STREAM_TEST_BUCKET_NAME.c_str());
984989
SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
985990
CreateBucketRequest createBucketRequest;
@@ -1136,6 +1141,7 @@ namespace
11361141

11371142
TEST_F(BucketAndObjectOperationTest, TestEventStreamWithLargeFile)
11381143
{
1144+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
11391145
Aws::String fullBucketName = CalculateBucketName(BASE_EVENT_STREAM_LARGE_FILE_TEST_BUCKET_NAME.c_str());
11401146
SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
11411147
CreateBucketRequest createBucketRequest;
@@ -1212,6 +1218,7 @@ namespace
12121218

12131219
TEST_F(BucketAndObjectOperationTest, TestErrorsInXml)
12141220
{
1221+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
12151222
SelectObjectContentRequest selectObjectContentRequest;
12161223
selectObjectContentRequest.SetBucket("adskflaklfakl");
12171224
selectObjectContentRequest.SetKey(TEST_EVENT_STREAM_OBJ_KEY);
@@ -1242,6 +1249,7 @@ namespace
12421249

12431250
TEST_F(BucketAndObjectOperationTest, TestErrorsInEventStream)
12441251
{
1252+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
12451253
Aws::String fullBucketName = CalculateBucketName(BASE_EVENT_STREAM_ERRORS_IN_EVENT_TEST_BUCKET_NAME.c_str());
12461254
SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
12471255
CreateBucketRequest createBucketRequest;

tests/aws-cpp-sdk-s3-crt-integration-tests/S3ExpressTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <aws/testing/AwsTestHelpers.h>
88
#include <aws/core/platform/Environment.h>
99
#include <aws/core/http/HttpResponse.h>
10+
#include <aws/core/utils/HashingUtils.h>
1011
#include <aws/s3-crt/S3CrtClient.h>
1112
#include <aws/s3-crt/model/DeleteBucketRequest.h>
1213
#include <aws/s3-crt/model/CreateBucketRequest.h>
@@ -19,7 +20,6 @@
1920
#include <aws/s3-crt/model/CreateMultipartUploadRequest.h>
2021
#include <aws/s3-crt/model/UploadPartRequest.h>
2122
#include <aws/s3-crt/model/CompleteMultipartUploadRequest.h>
22-
#include <aws/s3-crt/model/SelectObjectContentRequest.h>
2323
#include <aws/s3-crt/model/ListDirectoryBucketsRequest.h>
2424
#include <aws/s3-crt/model/CreateSessionRequest.h>
2525
#include <aws/s3-crt/model/PutBucketPolicyRequest.h>

tests/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
#endif
5757
#endif
5858

59+
#if defined(_WIN32)
60+
// disable "warning C4702: unreachable code" from GTEST_SKIP on newer MSVS
61+
#pragma warning(disable: 4702)
62+
#endif
63+
5964
#include <aws/core/http/standard/StandardHttpRequest.h>
6065

6166

@@ -1591,9 +1596,9 @@ namespace
15911596
DeleteObjectOutcome deleteObjectOutcome = Client->DeleteObject(deleteObjectRequest);
15921597
AWS_ASSERT_SUCCESS(deleteObjectOutcome);
15931598
}
1594-
15951599
TEST_F(BucketAndObjectOperationTest, TestObjectOperationWithEventStream)
15961600
{
1601+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
15971602
const Aws::String fullBucketName = CalculateBucketName(BASE_EVENT_STREAM_TEST_BUCKET_NAME.c_str());
15981603
SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
15991604
CreateBucketRequest createBucketRequest;
@@ -1672,6 +1677,7 @@ namespace
16721677
// This test is to test failed event stream request will not cause crash during retry.
16731678
TEST_F(BucketAndObjectOperationTest, TestSelectObjectOperationWithEventStreamFailWithRetry)
16741679
{
1680+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
16751681
const Aws::String fullBucketName = CalculateBucketName(BASE_EVENT_STREAM_TEST_BUCKET_NAME.c_str());
16761682
SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
16771683
CreateBucketRequest createBucketRequest;
@@ -1747,6 +1753,7 @@ namespace
17471753

17481754
TEST_F(BucketAndObjectOperationTest, TestEventStreamWithLargeFile)
17491755
{
1756+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
17501757
const Aws::String fullBucketName = CalculateBucketName(BASE_EVENT_STREAM_LARGE_FILE_TEST_BUCKET_NAME.c_str());
17511758
SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
17521759
CreateBucketRequest createBucketRequest;
@@ -1823,6 +1830,7 @@ namespace
18231830

18241831
TEST_F(BucketAndObjectOperationTest, TestErrorsInXml)
18251832
{
1833+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
18261834
SelectObjectContentRequest selectObjectContentRequest;
18271835
selectObjectContentRequest.SetBucket("adskflaklfakl");
18281836
selectObjectContentRequest.SetKey(TEST_EVENT_STREAM_OBJ_KEY);
@@ -1853,6 +1861,7 @@ namespace
18531861

18541862
TEST_F(BucketAndObjectOperationTest, TestErrorsInEventStream)
18551863
{
1864+
GTEST_SKIP() << "Select objects is not supported on new AWS accounts";
18561865
const Aws::String fullBucketName = CalculateBucketName(BASE_EVENT_STREAM_ERRORS_IN_EVENT_TEST_BUCKET_NAME.c_str());
18571866
SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
18581867
CreateBucketRequest createBucketRequest;

tests/aws-cpp-sdk-s3-integration-tests/S3ExpressTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <aws/testing/AwsTestHelpers.h>
88
#include <aws/core/platform/Environment.h>
99
#include <aws/core/http/HttpResponse.h>
10+
#include <aws/core/utils/HashingUtils.h>
1011
#include <aws/s3/S3Client.h>
1112
#include <aws/s3/model/DeleteBucketRequest.h>
1213
#include <aws/s3/model/CreateBucketRequest.h>
@@ -19,7 +20,6 @@
1920
#include <aws/s3/model/CreateMultipartUploadRequest.h>
2021
#include <aws/s3/model/UploadPartRequest.h>
2122
#include <aws/s3/model/CompleteMultipartUploadRequest.h>
22-
#include <aws/s3/model/SelectObjectContentRequest.h>
2323
#include <aws/s3/model/ListDirectoryBucketsRequest.h>
2424
#include <aws/s3/model/CreateSessionRequest.h>
2525
#include <aws/s3/model/PutBucketPolicyRequest.h>

0 commit comments

Comments
 (0)