Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lint files with 'integration' build flag #1508

Merged
merged 17 commits into from May 18, 2020
Merged

Lint files with 'integration' build flag #1508

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a503dfa
Lint files with 'integration' build flag
May 12, 2020
34d0fe1
Only delete resources we actually create
May 14, 2020
9250376
Don't try to delete what isn't there
May 14, 2020
7933add
Don't try to delete resources from a stopped test manager
May 14, 2020
d22bba0
Delete all resources created by 'kudo init'
May 14, 2020
c3f49a4
Check for error on deletion
May 14, 2020
89dfc6f
Clean up in all test cases
May 14, 2020
4228e4e
Delete namespace as last step
May 14, 2020
d2def26
Different approach when deleting prereqs
May 14, 2020
9c48626
Change deletion order
May 14, 2020
16d9962
Ignore error when deleting prereqs
May 14, 2020
ffa3373
Ignore errors on deletion
May 15, 2020
0b6e6e2
Only delete resources that (should) have been created
May 15, 2020
7ba3200
Only delete CRDs after they have been created by 'kudo init'
May 15, 2020
48b5517
Deferred call arguments are evaluated immediately!
May 15, 2020
6b13823
Hopefully fix last failing tests
May 15, 2020
9ab2f3e
Remove unused code
May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .golangci.yml
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ linters:
- goconst
- lll
run:
build-tags:
- integration
skip-dirs:
# autogenerated clientset by client-gen
- pkg/client
Expand Down
7 changes: 5 additions & 2 deletions pkg/controller/instance/instance_controller_test.go
View file
Open in desktop
Expand Up @@ -74,7 +74,6 @@ func TestRestartController(t *testing.T) {
}
instanceKey, _ := client.ObjectKeyFromObject(in)
assert.NoError(t, c.Create(context.TODO(), in))
defer c.Delete(context.TODO(), in)

ov := &v1beta1.OperatorVersion{
ObjectMeta: metav1.ObjectMeta{Name: "foo-operator", Namespace: "default"},
Expand All @@ -90,7 +89,6 @@ func TestRestartController(t *testing.T) {
},
}
assert.NoError(t, c.Create(context.TODO(), ov))
defer c.Delete(context.TODO(), ov)

log.Print("And a deploy plan that was already run")
assert.Eventually(t, func() bool { return instancePlanFinished(instanceKey, "deploy", c) }, timeout, tick)
Expand Down Expand Up @@ -140,6 +138,7 @@ func startTestManager(t *testing.T) (chan struct{}, *sync.WaitGroup, client.Clie
Recorder: mgr.GetEventRecorderFor("instance-controller"),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr)
assert.NoError(t, err, "Error when setting up manager")

stop := make(chan struct{})
wg := &sync.WaitGroup{}
Expand Down Expand Up @@ -326,6 +325,8 @@ func Test_makePipes(t *testing.T) {
}

for _, tt := range tests {
tt := tt

t.Run(tt.name, func(t *testing.T) {
got, err := PipesMap(tt.planName, tt.plan, tt.tasks, tt.emeta)
if err != nil {
Expand Down Expand Up @@ -553,6 +554,8 @@ func Test_fetchNewExecutionPlan(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt

t.Run(tt.name, func(t *testing.T) {
got, err := fetchNewExecutionPlan(tt.i, tt.ov)
assert.Equal(t, tt.wantErr, err != nil, "expected error %v, but got %v", tt.wantErr, err)
Expand Down