Skip to content

Commit cd519f9

Browse files
committed
Account for no no_created testdata.
Signed-off-by: Humair Khan <[email protected]>
1 parent 6ed174f commit cd519f9

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

controllers/testdata/declarative/case_3/expected/not_created/sample-config.yaml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ metadata:
66
labels:
77
app: ds-pipeline-testdsp2
88
component: data-science-pipelines
9-
data: {}
9+
data: {}

controllers/testdata/declarative/case_3/expected/not_created/sample-pipeline.yaml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ metadata:
66
labels:
77
app: ds-pipeline-testdsp2
88
component: data-science-pipelines
9-
data: {}
9+
data: {}

controllers/testutil/util.go

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"io/ioutil"
2525
apierrs "k8s.io/apimachinery/pkg/api/errors"
2626
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
27+
"os"
2728
"sigs.k8s.io/controller-runtime/pkg/client"
2829
"time"
2930
)
@@ -146,6 +147,18 @@ func CompareResources(uc UtilContext, path string) {
146147
Expect(result).Should(BeTrue())
147148
}
148149

150+
// DirExists checks whether dir at path exists
151+
func DirExists(path string) (bool, error) {
152+
_, err := os.Stat(path)
153+
if err == nil {
154+
return true, nil
155+
}
156+
if os.IsNotExist(err) {
157+
return false, nil
158+
}
159+
return false, err
160+
}
161+
149162
// GenerateDeclarativeTestCases dynamically generate
150163
// testcases based on resources located in the testdata
151164
// directory.
@@ -166,18 +179,27 @@ func GenerateDeclarativeTestCases() []Case {
166179
}
167180

168181
caseCreateDir := fmt.Sprintf("%s/expected/created", caseDir)
169-
toCreate, err := ioutil.ReadDir(caseCreateDir)
182+
caseCreationsFound, err := DirExists(caseCreateDir)
170183
Expect(err).ToNot(HaveOccurred(), "Failed to read 'create' dir.")
171-
for _, f := range toCreate {
172-
newCase.Expected.Created = append(newCase.Expected.Created, fmt.Sprintf("%s/%s", caseCreateDir, f.Name()))
184+
if caseCreationsFound {
185+
toCreate, err := ioutil.ReadDir(caseCreateDir)
186+
Expect(err).ToNot(HaveOccurred(), "Failed to read 'create' dir.")
187+
for _, f := range toCreate {
188+
newCase.Expected.Created = append(newCase.Expected.Created, fmt.Sprintf("%s/%s", caseCreateDir, f.Name()))
189+
}
173190
}
174191

175192
caseNotCreateDir := fmt.Sprintf("%s/expected/not_created", caseDir)
176-
toNotCreate, err := ioutil.ReadDir(caseNotCreateDir)
193+
caseNoCreationsFound, err := DirExists(caseNotCreateDir)
177194
Expect(err).ToNot(HaveOccurred(), "Failed to read 'not_create' dir.")
178-
for _, f := range toNotCreate {
179-
newCase.Expected.NotCreated = append(newCase.Expected.NotCreated, fmt.Sprintf("%s/%s", caseNotCreateDir, f.Name()))
195+
if caseNoCreationsFound {
196+
toNotCreate, err := ioutil.ReadDir(caseNotCreateDir)
197+
Expect(err).ToNot(HaveOccurred(), "Failed to read 'not_create' dir.")
198+
for _, f := range toNotCreate {
199+
newCase.Expected.NotCreated = append(newCase.Expected.NotCreated, fmt.Sprintf("%s/%s", caseNotCreateDir, f.Name()))
200+
}
180201
}
202+
181203
newCase.Description = fmt.Sprintf("[%s] - When a DSPA is deployed", caseName)
182204

183205
newCase.Config = fmt.Sprintf("%s/config.yaml", caseDir)

0 commit comments

Comments
 (0)