kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ale...@apache.org
Subject kudu git commit: [tests] minor cleanup on BadTabletCopyITest
Date Thu, 13 Sep 2018 01:37:39 GMT
Repository: kudu
Updated Branches:
  refs/heads/master ebb2852d9 -> f31e5cbc7


[tests] minor cleanup on BadTabletCopyITest

Added missing NO_FATALS() for StartCluster() and LoadTable().

Change-Id: If6db0c613db6e4ea4dec034089a1fc980317e776
Reviewed-on: http://gerrit.cloudera.org:8080/11434
Reviewed-by: Adar Dembo <adar@cloudera.com>
Tested-by: Kudu Jenkins


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/f31e5cbc
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/f31e5cbc
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/f31e5cbc

Branch: refs/heads/master
Commit: f31e5cbc7c3b545a0eb388afd1733541a88037ba
Parents: ebb2852
Author: Alexey Serbin <aserbin@cloudera.com>
Authored: Wed Sep 12 16:58:24 2018 -0700
Committer: Alexey Serbin <aserbin@cloudera.com>
Committed: Thu Sep 13 01:04:35 2018 +0000

----------------------------------------------------------------------
 src/kudu/integration-tests/tablet_copy-itest.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/f31e5cbc/src/kudu/integration-tests/tablet_copy-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/tablet_copy-itest.cc b/src/kudu/integration-tests/tablet_copy-itest.cc
index d4cf644..5b60b06 100644
--- a/src/kudu/integration-tests/tablet_copy-itest.cc
+++ b/src/kudu/integration-tests/tablet_copy-itest.cc
@@ -1472,7 +1472,7 @@ TEST_P(BadTabletCopyITest, TestBadCopy) {
   const int kMinRows = 10000;
   const int kMinBlocks = 10;
   const string& failure_flag = GetParam();
-  StartCluster(
+  NO_FATALS(StartCluster(
       {
         // Flush aggressively to create many blocks.
         "--flush_threshold_mb=0",
@@ -1483,7 +1483,7 @@ TEST_P(BadTabletCopyITest, TestBadCopy) {
       }, {
         // Wait only 5 seconds before master decides TS not eligible for a replica.
         "--tserver_unresponsive_timeout_ms=5000",
-      }, kNumTabletServers);
+      }, kNumTabletServers));
 
   // Don't allow TS 3 to get a copy of Table A.
   cluster_->tablet_server(3)->Shutdown();
@@ -1499,7 +1499,7 @@ TEST_P(BadTabletCopyITest, TestBadCopy) {
   ASSERT_OK(cluster_->tablet_server(3)->Restart());
 
   // Load Table A.
-  LoadTable(&workload1, kMinRows, kMinBlocks);
+  NO_FATALS(LoadTable(&workload1, kMinRows, kMinBlocks));
 
   // Don't allow TS 0 to get a copy of Table B.
   cluster_->tablet_server(0)->Shutdown();
@@ -1515,7 +1515,7 @@ TEST_P(BadTabletCopyITest, TestBadCopy) {
   ASSERT_OK(cluster_->tablet_server(0)->Restart());
 
   // Load Table B.
-  LoadTable(&workload2, kMinRows, kMinBlocks);
+  NO_FATALS(LoadTable(&workload2, kMinRows, kMinBlocks));
 
   // Shut down replica with only [A].
   cluster_->tablet_server(0)->Shutdown();
@@ -1546,7 +1546,7 @@ TEST_P(BadTabletCopyITest, TestBadCopy) {
 
   // Wait for TS 3 to tombstone the replica that failed to copy.
   TServerDetails* ts = ts_map_[cluster_->tablet_server(3)->uuid()];
-  AssertEventually([&] {
+  ASSERT_EVENTUALLY([&] {
     vector<tserver::ListTabletsResponsePB_StatusAndSchemaPB> tablets;
     ASSERT_OK(ListTablets(ts, MonoDelta::FromSeconds(10), &tablets));
     ASSERT_EQ(2, tablets.size());
@@ -1558,7 +1558,6 @@ TEST_P(BadTabletCopyITest, TestBadCopy) {
     }
     ASSERT_EQ(1, num_tombstoned);
   });
-  NO_FATALS();
 
   // Restart the whole cluster without failure injection so that it can finish
   // re-replicating.


Mime
View raw message