Skip to content

more multi thread coordination need to avoid panics in TestStartBuildRunFollowLog #41

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

Merged
merged 1 commit into from
Sep 22, 2021
Merged

more multi thread coordination need to avoid panics in TestStartBuildRunFollowLog #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions pkg/shp/cmd/build/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"strings"
"sync"
"testing"
"time"

buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
shpfake "github.com/shipwright-io/build/pkg/client/clientset/versioned/fake"
Expand All @@ -14,6 +15,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/kubernetes/fake"
fakekubetesting "k8s.io/client-go/testing"
Expand Down Expand Up @@ -154,6 +156,23 @@ func TestStartBuildRunFollowLog(t *testing.T) {
// coordination between Run and onEvent
runtime.Gosched()

// even with our release of the context above with Gosched(), repeated runs in CI have surfaced occasional timing issues between
// cmd.Run() finishing initialization and cmd.onEvent trying to used struct variables, resulting in panics; so we employ the lock here
// to insure the required initializations have run; this is still better than a generic "sleep log enough for
// the init to occur.
cmd.watchLock.Lock()
err := wait.PollImmediate(1*time.Second, 3*time.Second, func() (done bool, err error) {
if cmd.pw != nil {
cmd.watchLock.Unlock()
return true, nil
}
return false, nil
})
if err != nil {
cmd.watchLock.Unlock()
t.Errorf("Run initialization did not complete in time")
}

// mimic watch events, bypassing k8s fake client watch hoopla whose plug points are not always useful;
pod.Status.Phase = test.phase
cmd.onEvent(pod)
Expand Down