Skip to content

Commit 81ab21d

Browse files
committed
Reapply "wahhh?"
This reverts commit 72b41a3.
1 parent e1295ff commit 81ab21d

1 file changed

Lines changed: 42 additions & 18 deletions

File tree

test/SerialIOTest.cpp

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5064,9 +5064,8 @@ this = "should not warn"
50645064

50655065
// BP3 engine writes files, BP4 writes directories
50665066
REQUIRE(openPMD::auxiliary::file_exists("../samples/jsonConfiguredBP3.bp"));
5067-
REQUIRE(
5068-
openPMD::auxiliary::directory_exists(
5069-
"../samples/jsonConfiguredBP4.bp"));
5067+
REQUIRE(openPMD::auxiliary::directory_exists(
5068+
"../samples/jsonConfiguredBP4.bp"));
50705069

50715070
std::string readConfigBP3 = R"END(
50725071
{
@@ -5243,14 +5242,35 @@ TEST_CASE("bp4_steps", "[serial][adios2]")
52435242

52445243
void serial_iterator(std::string const &file)
52455244
{
5245+
auto const write_config = R"(
5246+
init_aws_api = true
5247+
rank_table = "posix_hostname"
5248+
5249+
[json.attribute]
5250+
mode = "short"
5251+
5252+
[json.dataset.mode]
5253+
provider = "aws"
5254+
access_key_id = "test"
5255+
secret_access_key = "test"
5256+
endpoint = "http://localhost:4566"
5257+
bucket = "simdata"
5258+
)";
5259+
auto const read_config = R"(
5260+
init_aws_api = true
5261+
5262+
[json.dataset.mode]
5263+
access_key_id = "test"
5264+
secret_access_key = "test"
5265+
)";
52465266
constexpr Extent::value_type extent = 1000;
52475267
{
52485268
Series writeSeries(
52495269
file,
52505270
Access::CREATE_LINEAR
52515271
#ifndef _WIN32
52525272
,
5253-
R"({"rank_table": "posix_hostname"})"
5273+
write_config
52545274
#endif
52555275
);
52565276
auto iterations = writeSeries.snapshots();
@@ -5265,7 +5285,7 @@ void serial_iterator(std::string const &file)
52655285
}
52665286
}
52675287

5268-
Series readSeries(file, Access::READ_ONLY);
5288+
Series readSeries(file, Access::READ_ONLY, read_config);
52695289

52705290
size_t last_iteration_index = 0;
52715291
size_t numberOfIterations = 0;
@@ -5301,19 +5321,23 @@ void serial_iterator(std::string const &file)
53015321

53025322
TEST_CASE("serial_iterator", "[serial][adios2]")
53035323
{
5304-
for (auto const &t : testedFileExtensions())
5305-
{
5306-
#ifdef _WIN32
5307-
serial_iterator("../samples/serial_iterator_filebased_%T." + t);
5308-
serial_iterator("../samples/serial_iterator_groupbased." + t);
5309-
#else
5310-
// Add some regex characters into the file names to see that we can deal
5311-
// with that. Don't do that on Windows because Windows does not like
5312-
// those characters within file paths.
5313-
serial_iterator("../samples/serial_iterator_filebased_+?_%T." + t);
5314-
serial_iterator("../samples/serial_iterator_groupbased_+?." + t);
5315-
#endif
5316-
}
5324+
serial_iterator("../samples/serial_iterator.json");
5325+
// for (auto const &t : testedFileExtensions())
5326+
// {
5327+
// #ifdef _WIN32
5328+
// serial_iterator("../samples/serial_iterator_filebased_%T." + t);
5329+
// serial_iterator("../samples/serial_iterator_groupbased." + t);
5330+
// #else
5331+
// // Add some regex characters into the file names to see that we
5332+
// can deal
5333+
// // with that. Don't do that on Windows because Windows does not
5334+
// like
5335+
// // those characters within file paths.
5336+
// serial_iterator("../samples/serial_iterator_filebased_+?_%T." +
5337+
// t); serial_iterator("../samples/serial_iterator_groupbased_+?." +
5338+
// t);
5339+
// #endif
5340+
// }
53175341
}
53185342

53195343
void variableBasedSingleIteration(std::string const &file)

0 commit comments

Comments
 (0)