Quick fix on db_cloud_test

Duc Hieu Pham · Duc Hieu Pham · commit ef83c2f90995 · 2020-03-11T22:48:28.000Z
Summary: Use test id with the clone db in `SavePoint` test so that other tests can run in parallel. Otherwise, if there are 2 tests in parallel, it might update the same folder in S3, leading to test failure Test Plan: Run it Reviewers: #platform, joe Reviewed By: #platform, joe Differential Revision: https://rockset.phacility.com/D5654
diff --git a/cloud/db_cloud_test.cc b/cloud/db_cloud_test.cc
@@ -674,7 +674,7 @@ TEST_F(CloudTest, Savepoint) {
   ASSERT_TRUE(value.compare("World") == 0);
   CloseDB();
   value.clear();
-  std::string dest_path = "/clone2_path";
+  std::string dest_path = "/clone2_path-" + test_id_;
   {
     // Create a new instance with different src and destination paths.
     // This is true clone and should have all the contents of the masterdb
@@ -731,6 +731,7 @@ TEST_F(CloudTest, Savepoint) {
     ASSERT_OK(cloud_db->Get(ReadOptions(), "Hell", &value));
     ASSERT_TRUE(value.compare("Done") == 0);
   }
+  aenv_->EmptyBucket(aenv_->GetSrcBucketName(), dest_path);
 }
 
 TEST_F(CloudTest, Encryption) {

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ TEST_F(CloudTest, Savepoint) {`
`674`	`674`	`ASSERT_TRUE(value.compare("World") == 0);`
`675`	`675`	`CloseDB();`
`676`	`676`	`value.clear();`
`677`		`- std::string dest_path = "/clone2_path";`
	`677`	`+ std::string dest_path = "/clone2_path-" + test_id_;`
`678`	`678`	`{`
`679`	`679`	`// Create a new instance with different src and destination paths.`
`680`	`680`	`// This is true clone and should have all the contents of the masterdb`
`@@ -731,6 +731,7 @@ TEST_F(CloudTest, Savepoint) {`
`731`	`731`	`ASSERT_OK(cloud_db->Get(ReadOptions(), "Hell", &value));`
`732`	`732`	`ASSERT_TRUE(value.compare("Done") == 0);`
`733`	`733`	`}`
	`734`	`+ aenv_->EmptyBucket(aenv_->GetSrcBucketName(), dest_path);`
`734`	`735`	`}`
`735`	`736`
`736`	`737`	`TEST_F(CloudTest, Encryption) {`