fix: added count method (#4985)

* fix: added count method * fix: added Count method to results and suites results * fix: added cool down to flaky test
kubeshop · Feb 9, 2024 · a53f26e · a53f26e
1 parent 1acd131
commit a53f26e
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 11 deletions.
diff --git a/internal/app/api/v1/executions_test.go b/internal/app/api/v1/executions_test.go
@@ -281,6 +281,10 @@ func (r MockExecutionResultsRepository) GetTestMetrics(ctx context.Context, name
 	panic("not implemented")
 }
 
+func (r MockExecutionResultsRepository) Count(ctx context.Context, filter result.Filter) (int64, error) {
+	panic("not implemented")
+}
+
 type MockExecutor struct {
 	LogsFn func(id string) (chan output.Output, error)
 }

diff --git a/pkg/cloud/data/result/result.go b/pkg/cloud/data/result/result.go
@@ -316,3 +316,7 @@ func (r *CloudRepository) GetTestMetrics(ctx context.Context, name string, limit
 	}
 	return commandResponse.Metrics, nil
 }
+
+func (r *CloudRepository) Count(ctx context.Context, filter result.Filter) (int64, error) {
+	return 0, nil
+}
diff --git a/pkg/cloud/data/testresult/testresult.go b/pkg/cloud/data/testresult/testresult.go
@@ -234,3 +234,7 @@ func (r *CloudRepository) GetTestSuiteMetrics(ctx context.Context, name string,
 	}
 	return commandResponse.Metrics, nil
 }
+
+func (r *CloudRepository) Count(ctx context.Context, filter testresult.Filter) (int64, error) {
+	return 0, nil
+}
diff --git a/pkg/executor/containerexecutor/containerexecutor_test.go b/pkg/executor/containerexecutor/containerexecutor_test.go
@@ -450,6 +450,11 @@ func (r FakeResultRepository) GetTestMetrics(ctx context.Context, name string, l
 	panic("implement me")
 }
 
+func (r FakeResultRepository) Count(ctx context.Context, filter result.Filter) (count int64, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
 func (FakeResultRepository) Get(ctx context.Context, id string) (testkube.Execution, error) {
 	return testkube.Execution{}, nil
 }

diff --git a/pkg/executor/scraper/mock_scraper.go b/pkg/executor/scraper/mock_scraper.go
diff --git a/pkg/executor/scraper/mock_uploader.go b/pkg/executor/scraper/mock_uploader.go
diff --git a/pkg/logs/events_test.go b/pkg/logs/events_test.go
@@ -172,7 +172,7 @@ func TestLogs_EventsFlow(t *testing.T) {
 		// and wait for message to be propagated
 		emitter.Notify(testkube.NewEventEndTestFailed(&testkube.Execution{Id: "id1"}))
 
-		time.Sleep(time.Second)
+		time.Sleep(waitTime)
 
 		assertMessagesCount(t, a, messagesCount)
 
@@ -253,6 +253,9 @@ func TestLogs_EventsFlow(t *testing.T) {
 		_, err = stream.Stop(ctx, id)
 		assert.NoError(t, err)
 
+		// cool down
+		time.Sleep(waitTime)
+
 		// then each adapter should receive messages
 		assertMessagesCount(t, a1, messagesCount)
 		assertMessagesCount(t, a2, messagesCount)

diff --git a/pkg/repository/config/mock_repository.go b/pkg/repository/config/mock_repository.go
diff --git a/pkg/repository/result/interface.go b/pkg/repository/result/interface.go
@@ -69,8 +69,10 @@ type Repository interface {
 	DeleteByTestSuites(ctx context.Context, testSuiteNames []string) (err error)
 	// DeleteForAllTestSuites deletes execution results for all test suites
 	DeleteForAllTestSuites(ctx context.Context) (err error)
-
+	// GetTestMetrics returns metrics for test
 	GetTestMetrics(ctx context.Context, name string, limit, last int) (metrics testkube.ExecutionsMetrics, err error)
+	// Count returns executions count
+	Count(ctx context.Context, filter Filter) (int64, error)
 }
 
 type Sequences interface {

diff --git a/pkg/repository/result/mock_repository.go b/pkg/repository/result/mock_repository.go
diff --git a/pkg/repository/result/mongo.go b/pkg/repository/result/mongo.go
@@ -455,6 +455,11 @@ func (r *MongoRepository) GetExecutions(ctx context.Context, filter Filter) (res
 	return
 }
 
+func (r *MongoRepository) Count(ctx context.Context, filter Filter) (count int64, err error) {
+	query, _ := composeQueryAndOpts(filter)
+	return r.ResultsColl.CountDocuments(ctx, query)
+}
+
 func (r *MongoRepository) GetExecutionTotals(ctx context.Context, paging bool, filter ...Filter) (totals testkube.ExecutionsTotals, err error) {
 	var result []struct {
 		Status string `bson:"_id"`

diff --git a/pkg/repository/testresult/interface.go b/pkg/repository/testresult/interface.go
@@ -27,7 +27,7 @@ type Filter interface {
 	Selector() string
 }
 
-//go:generate mockgen -destination=./mock_repository.go -package=testresult "github.com/kubeshop/testkube/internal/pkg/api/repository/testresult" Repository
+//go:generate mockgen -destination=./mock_repository.go -package=testresult "github.com/kubeshop/testkube/pkg/repository/testresult" Repository
 type Repository interface {
 	// Get gets execution result by id or name
 	Get(ctx context.Context, id string) (testkube.TestSuiteExecution, error)
@@ -55,6 +55,8 @@ type Repository interface {
 	DeleteAll(ctx context.Context) error
 	// DeleteByTestSuites deletes execution results by test suites
 	DeleteByTestSuites(ctx context.Context, testSuiteNames []string) (err error)
-
+	// GetTestSuiteMetrics returns metrics for test suite
 	GetTestSuiteMetrics(ctx context.Context, name string, limit, last int) (metrics testkube.ExecutionsMetrics, err error)
+	// Count returns executions count
+	Count(ctx context.Context, filter Filter) (int64, error)
 }
diff --git a/pkg/repository/testresult/mock_repository.go b/pkg/repository/testresult/mock_repository.go
diff --git a/pkg/repository/testresult/mongo.go b/pkg/repository/testresult/mongo.go
@@ -288,6 +288,11 @@ func (r *MongoRepository) GetNewestExecutions(ctx context.Context, limit int) (r
 	return
 }
 
+func (r *MongoRepository) Count(ctx context.Context, filter Filter) (count int64, err error) {
+	query, _ := composeQueryAndOpts(filter)
+	return r.Coll.CountDocuments(ctx, query)
+}
+
 func (r *MongoRepository) GetExecutionsTotals(ctx context.Context, filter ...Filter) (totals testkube.ExecutionsTotals, err error) {
 	var result []struct {
 		Status string `bson:"_id"`

diff --git a/pkg/storage/artifacts_mock.go b/pkg/storage/artifacts_mock.go