Skip to content

Commit a6ecb2a

Browse files
committed
Consolidate client/reconciler initialization
Signed-off-by: Todd Short <[email protected]>
1 parent 61783da commit a6ecb2a

File tree

3 files changed

+51
-192
lines changed

3 files changed

+51
-192
lines changed

internal/controllers/admission_test.go

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,8 @@ func TestOperatorSpecs(t *testing.T) {
6363
d := od
6464
t.Run(d.comment, func(t *testing.T) {
6565
t.Parallel()
66-
t.Logf("Running %s", d.comment)
67-
cl, err := newClient()
68-
require.NoError(t, err)
69-
require.NotNil(t, cl)
70-
err = cl.Create(ctx, d.spec)
66+
cl := newClient(t)
67+
err := cl.Create(ctx, d.spec)
7168
require.Error(t, err)
7269
require.ErrorContains(t, err, d.errMsg)
7370
})
@@ -104,10 +101,8 @@ func TestOperatorInvalidSemver(t *testing.T) {
104101
d := sm
105102
t.Run(d, func(t *testing.T) {
106103
t.Parallel()
107-
cl, err := newClient()
108-
require.NoError(t, err)
109-
require.NotNil(t, cl)
110-
err = cl.Create(ctx, operator(operatorsv1alpha1.OperatorSpec{
104+
cl := newClient(t)
105+
err := cl.Create(ctx, operator(operatorsv1alpha1.OperatorSpec{
111106
PackageName: "package",
112107
Version: d,
113108
}))
@@ -161,14 +156,12 @@ func TestOperatorValidSemver(t *testing.T) {
161156
d := smx
162157
t.Run(d, func(t *testing.T) {
163158
t.Parallel()
159+
cl := newClient(t)
164160
op := operator(operatorsv1alpha1.OperatorSpec{
165161
PackageName: "package",
166162
Version: d,
167163
})
168-
cl, err := newClient()
169-
require.NoError(t, err)
170-
require.NotNil(t, cl)
171-
err = cl.Create(ctx, op)
164+
err := cl.Create(ctx, op)
172165
require.NoErrorf(t, err, "unexpected error for semver range %q: %w", d, err)
173166
})
174167
}
@@ -193,10 +186,8 @@ func TestOperatorInvalidChannel(t *testing.T) {
193186
d := ch
194187
t.Run(d, func(t *testing.T) {
195188
t.Parallel()
196-
cl, err := newClient()
197-
require.NoError(t, err)
198-
require.NotNil(t, cl)
199-
err = cl.Create(ctx, operator(operatorsv1alpha1.OperatorSpec{
189+
cl := newClient(t)
190+
err := cl.Create(ctx, operator(operatorsv1alpha1.OperatorSpec{
200191
PackageName: "package",
201192
Channel: d,
202193
}))
@@ -220,14 +211,12 @@ func TestOperatorValidChannel(t *testing.T) {
220211
d := ch
221212
t.Run(d, func(t *testing.T) {
222213
t.Parallel()
214+
cl := newClient(t)
223215
op := operator(operatorsv1alpha1.OperatorSpec{
224216
PackageName: "package",
225217
Channel: d,
226218
})
227-
cl, err := newClient()
228-
require.NoError(t, err)
229-
require.NotNil(t, cl)
230-
err = cl.Create(ctx, op)
219+
err := cl.Create(ctx, op)
231220
require.NoErrorf(t, err, "unexpected error creating valid channel %q: %w", d, err)
232221
})
233222
}

0 commit comments

Comments
 (0)