FMWK-556-restore-folder-validation

- tests
aerospike · Oct 2, 2024 · 15313fa · 15313fa
1 parent 0d07702
commit 15313fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 40 deletions.
diff --git a/io/azure/blob/reader_writer_test.go b/io/azure/blob/reader_writer_test.go
@@ -219,19 +219,9 @@ func (s *AzureSuite) TestReader_StreamFilesEmpty() {
 
 	go reader.StreamFiles(ctx, rCH, eCH)
 
-	var filesCounter int
-
-	for {
-		select {
-		case err := <-eCH:
-			s.Require().NoError(err)
-		case _, ok := <-rCH:
-			if !ok {
-				require.Equal(s.T(), 0, filesCounter)
-				return
-			}
-			filesCounter++
-		}
+	for err = range eCH {
+		s.Require().ErrorContains(err, "is empty")
+		return
 	}
 }
 

diff --git a/io/gcp/storage/reader_writer_test.go b/io/gcp/storage/reader_writer_test.go
@@ -276,19 +276,9 @@ func (s *GCPSuite) TestReader_StreamFilesEmpty() {
 
 	go reader.StreamFiles(ctx, rCH, eCH)
 
-	var filesCounter int
-
-	for {
-		select {
-		case err := <-eCH:
-			s.Require().NoError(err)
-		case _, ok := <-rCH:
-			if !ok {
-				require.Equal(s.T(), 0, filesCounter)
-				return
-			}
-			filesCounter++
-		}
+	for err = range eCH {
+		s.Require().ErrorContains(err, "is empty")
+		return
 	}
 }
 

diff --git a/io/local/reader_test.go b/io/local/reader_test.go
@@ -147,20 +147,9 @@ func (s *checkRestoreDirectoryTestSuite) TestDirectoryReader_StreamFiles_ErrEmpt
 	errorChan := make(chan error)
 	go streamingReader.StreamFiles(context.Background(), readerChan, errorChan)
 
-	var counter int
-	for {
-		select {
-		case _, ok := <-readerChan:
-			// if chan closed, we're done.
-			if !ok {
-				s.Require().Equal(2, counter)
-				return
-			}
-			counter++
-		case err = <-errorChan:
-			require.ErrorContains(s.T(), err, "is empty")
-			return
-		}
+	for err = range errorChan {
+		s.Require().ErrorContains(err, "is empty")
+		return
 	}
 }