debug

Author: ChrisspyB

tests/fdb/remote/test_remote_api.cc

@@ -132,7 +132,8 @@ CASE("Remote protocol: the basics") {
         keys = write_data(fdb, data_string, {"20000101", "20000102"}, {"fc", "pf"}, {"1", "2"});
     }
     EXPECT_EQUAL(keys.size(), Nfields);
-    
+    std::this_thread::sleep_for(std::chrono::seconds(2)); // Ensure server has time to flush consolidated indexes.
+
     // -- list all fields -
     size_t count = 0;
     {
@@ -144,11 +145,11 @@ CASE("Remote protocol: the basics") {
         }
         EXPECT_EQUAL(count, Nfields);
     }
-        
+
     // -- list all fields - use a temporary FDB instance to test if the RemoteFDb life is extended
     {
 
-        count = 0;
+        count   = 0;
         auto it = FDB{}.list(FDBToolRequest{make_request(keys)}, true);
         ListElement elem;
         while (it.next(elem)) {
@@ -161,7 +162,7 @@ CASE("Remote protocol: the basics") {
     // -- retrieve all fields -
     {
         std::unique_ptr<eckit::DataHandle> dh(FDB{}.retrieve(make_request(keys)));
-        
+
         eckit::AutoClose closer(*dh);
         dh->openForRead();
         for (int i = 0; i < Nfields; ++i) {
@@ -171,7 +172,7 @@ CASE("Remote protocol: the basics") {
             EXPECT_EQUAL(retrieved_string, data_string);
         }
     }
-    
+
     // -- wipe (doit=false) --
     {
         auto wipeit = FDB{}.wipe(FDBToolRequest::requestsFromString("date=20000101")[0]);
@@ -190,7 +191,7 @@ CASE("Remote protocol: the basics") {
 
     // -- list all fields again, expect same number as before
     {
-        count = 0;
+        count   = 0;
         auto it = FDB{}.list(FDBToolRequest{{}, true, {}}, true);
         ListElement elem;
         while (it.next(elem)) {
@@ -199,12 +200,12 @@ CASE("Remote protocol: the basics") {
         }
         EXPECT_EQUAL(count, Nfields);
     }
-        
+
     // -- list fields, expect same number. --
     {
 
         auto it = FDB{}.list(FDBToolRequest{make_request(keys)}, true);
-        ListElement elem;    
+        ListElement elem;
         count = 0;
         while (it.next(elem)) {
             eckit::Log::info() << "[CLIENT]" << elem << " " << elem.location() << std::endl;
@@ -223,7 +224,7 @@ CASE("Remote protocol: the basics") {
             eckit::Log::info() << "[CLIENT]" << wipeElem;
             element_counts[wipeElem.type()] += wipeElem.uris().size();
         }
-        
+
         // Expect: 2 store .data, 2 catalogue .index, 3 catalogue files (schema, toc, subtoc)
         EXPECT_EQUAL(element_counts[WipeElementType::STORE], 2);
         EXPECT_EQUAL(element_counts[WipeElementType::CATALOGUE_INDEX], 4);
@@ -233,7 +234,7 @@ CASE("Remote protocol: the basics") {
 
     // -- list all remaining fields
     {
-        count = 0;
+        count   = 0;
         auto it = FDB{}.list(FDBToolRequest{{}, true, {}}, true);
         ListElement elem;
         while (it.next(elem)) {
@@ -247,7 +248,7 @@ CASE("Remote protocol: the basics") {
     {
         auto wipeit = FDB{}.wipe(FDBToolRequest::requestsFromString("class=od")[0], true);
         WipeElement wipeElem;
-        count  = 0;
+        count = 0;
         while (wipeit.next(wipeElem)) {
             eckit::Log::info() << "[CLIENT]" << wipeElem;
             count++;
@@ -276,7 +277,6 @@ CASE("Remote protocol: more wipe testing") {
     }
 
 
-
     // -- write a few fields. 2 databases. Each with 1 index and 1 data file
     const size_t Nfields          = 8;
     const std::string data_string = "It's gonna be a bright, sunshiny day!";
@@ -286,6 +286,8 @@ CASE("Remote protocol: more wipe testing") {
         keys = write_data(fdb, data_string, {"20000101", "20000102"}, {"fc", "pf"}, {"1", "2"});
     }
     EXPECT_EQUAL(keys.size(), Nfields);
+    std::this_thread::sleep_for(std::chrono::seconds(2)); // Ensure server has time to flush consolidated indexes.
+
     // wipe a single date
     {
         auto wipeit = FDB{}.wipe(FDBToolRequest::requestsFromString("class=od,expver=xxxx,date=20000101")[0]);
@@ -307,6 +309,7 @@ CASE("Remote protocol: more wipe testing") {
         FDB fdb{};
         write_data(fdb, data_string, {"20000101", "20000102"}, {"fc", "pf"}, {"1", "2"});
     }
+    std::this_thread::sleep_for(std::chrono::seconds(2)); // Ensure server has time to flush consolidated indexes.
 
     // Wipe just one DB (date=20000101)
     std::vector<eckit::URI> data_uris;