refactor(k8s): move test logic to MockKubernetesRuntime interface

runtime/kubernetes/build_test.go

@@ -431,7 +431,7 @@ func TestKubernetes_StreamBuild(t *testing.T) {
 					cancel()
 				} else if test.doReady {
 					// simulate AssembleBuild
-					close(_engine.PodTracker.Ready)
+					_engine.MarkPodTrackerReady()
 				}
 			}()
 

runtime/kubernetes/container_test.go

@@ -517,11 +517,8 @@ func TestKubernetes_WaitContainer(t *testing.T) {
 			}
 
 			go func() {
-				oldPod := test.oldPod.DeepCopy()
-				oldPod.SetResourceVersion("older")
-
 				// simulate a re-sync/PodUpdate event
-				_engine.PodTracker.HandlePodUpdate(oldPod, _engine.Pod)
+				_engine.SimulateResync(test.oldPod)
 			}()
 
 			err = _engine.WaitContainer(context.Background(), test.container)

runtime/kubernetes/mock.go

@@ -85,3 +85,34 @@ func NewMock(_pod *v1.Pod, opts ...ClientOpt) (*client, error) {
 
 	return c, nil
 }
+
+// MockKubernetesRuntime makes it possible to use the client mocks in other packages.
+//
+// This interface is intended for running tests only.
+type MockKubernetesRuntime interface {
+	MarkPodTrackerReady()
+	SimulateResync(*v1.Pod)
+}
+
+// MarkPodTrackerReady signals that PodTracker has been setup with ContainerTrackers.
+//
+// This function is intended for running tests only.
+func (c *client) MarkPodTrackerReady() {
+	close(c.PodTracker.Ready)
+}
+
+// SimulateResync simulates an resync where the PodTracker refreshes its cache.
+// This resync is from oldPod to runtime.Pod. If nil, oldPod defaults to runtime.Pod.
+//
+// This function is intended for running tests only.
+func (c *client) SimulateResync(oldPod *v1.Pod) {
+	if oldPod == nil {
+		oldPod = c.Pod
+	}
+
+	oldPod = oldPod.DeepCopy()
+	oldPod.SetResourceVersion("older")
+
+	// simulate a re-sync/PodUpdate event
+	c.PodTracker.HandlePodUpdate(oldPod, c.Pod)
+}