Skip to content

Commit 4ec725f

Browse files
committed
Removing IsConfigRequired
1 parent 5aecd27 commit 4ec725f

File tree

4 files changed

+2
-44
lines changed

4 files changed

+2
-44
lines changed

internal/testrunner/runners/asset/runner.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ func (r runner) CanRunPerDataStream() bool {
5454
return false
5555
}
5656

57-
// IsConfigRequired returns whether this test runner needs configuration.
58-
func (r runner) IsConfigRequired() bool {
59-
return false
60-
}
61-
6257
// Run runs the asset loading tests
6358
func (r runner) Run(options testrunner.TestOptions) ([]testrunner.TestResult, error) {
6459
r.testFolder = options.TestFolder

internal/testrunner/runners/pipeline/runner.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ func (r *runner) CanRunPerDataStream() bool {
5959
return true
6060
}
6161

62-
// IsConfigRequired returns whether this test runner needs configuration.
63-
func (r *runner) IsConfigRequired() bool {
64-
return true
65-
}
66-
6762
func (r *runner) run() ([]testrunner.TestResult, error) {
6863
testCaseFiles, err := r.listTestCaseFiles()
6964
if err != nil {

internal/testrunner/runners/system/runner.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ func (r *runner) CanRunPerDataStream() bool {
6767
return true
6868
}
6969

70-
// IsConfigRequired returns whether this test runner needs configuration.
71-
func (r *runner) IsConfigRequired() bool {
72-
return true
73-
}
74-
7570
// Run runs the system tests defined under the given folder
7671
func (r *runner) Run(options testrunner.TestOptions) ([]testrunner.TestResult, error) {
7772
r.options = options

internal/testrunner/testrunner.go

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ type TestRunner interface {
4747
TearDown() error
4848

4949
CanRunPerDataStream() bool
50-
IsConfigRequired() bool
5150
}
5251

5352
var runners = map[TestType]TestRunner{}
@@ -183,44 +182,18 @@ func Run(testType TestType, options TestOptions) ([]TestResult, error) {
183182
return results, nil
184183
}
185184

186-
// NoConfigTestRunners returns test runners that don't need configuration.
187-
func NoConfigTestRunners() []TestRunner {
188-
noConfigRunners := make([]TestRunner, 0)
189-
for _, runner := range runners {
190-
if !runner.IsConfigRequired() {
191-
noConfigRunners = append(noConfigRunners, runner)
192-
}
193-
}
194-
195-
return noConfigRunners
196-
}
197-
198185
// TestRunners returns registered test runners.
199186
func TestRunners() map[TestType]TestRunner {
200187
return runners
201188
}
202189

190+
// findTestFoldersPaths can only be called for test runners that require tests to be defined
191+
// at the data stream level.
203192
func findTestFolderPaths(packageRootPath, dataStreamGlob, testTypeGlob string) ([]string, error) {
204193
testFoldersGlob := filepath.Join(packageRootPath, "data_stream", dataStreamGlob, "_dev", "test", testTypeGlob)
205194
paths, err := filepath.Glob(testFoldersGlob)
206195
if err != nil {
207196
return nil, errors.Wrap(err, "error finding test folders")
208197
}
209-
210-
// Handle test types that don't need configuration folders.
211-
dataStreamFoldersGlob := filepath.Join(packageRootPath, "data_stream", dataStreamGlob)
212-
dataStreamFolderPaths, err := filepath.Glob(dataStreamFoldersGlob)
213-
if err != nil {
214-
return nil, errors.Wrap(err, "error finding data stream folders")
215-
}
216-
for _, noConfigRunner := range NoConfigTestRunners() {
217-
t := noConfigRunner.Type()
218-
if testTypeGlob == "*" || testTypeGlob == string(t) {
219-
for _, p := range dataStreamFolderPaths {
220-
paths = append(paths, filepath.Join(p, string(t)))
221-
}
222-
}
223-
}
224-
225198
return paths, err
226199
}

0 commit comments

Comments
 (0)