test: fix sync no watch tests

Author: FabianKramm

pkg/devspace/services/sync.go

@@ -12,6 +12,11 @@ import (
 
 // StartSyncFromCmd starts a new sync from command
 func (serviceClient *client) StartSyncFromCmd(targetOptions targetselector.Options, syncConfig *latest.SyncConfig, interrupt chan error, noWatch, verbose bool) error {
+	if noWatch && interrupt == nil {
+		interrupt = make(chan error)
+		defer close(interrupt)
+	}
+
 	syncDone := make(chan struct{})
 	options := &synccontroller.Options{
 		Interrupt: interrupt,

pkg/devspace/services/synccontroller/controller.go

@@ -289,7 +289,20 @@ func (c *controller) startSync(options *Options, onInitUploadDone chan struct{},
 	}
 
 	log.Info("Waiting for containers to start...")
-	container, err := targetselector.GlobalTargetSelector.SelectSingleContainer(context.TODO(), c.client, options.TargetOptions, log)
+
+	ctx := context.Background()
+	if options.Interrupt != nil {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithCancel(ctx)
+		defer cancel()
+		
+		go func() {
+			<-options.Interrupt
+			cancel()
+		}()
+	}
+
+	container, err := targetselector.GlobalTargetSelector.SelectSingleContainer(ctx, c.client, options.TargetOptions, log)
 	if err != nil {
 		return nil, nil, errors.Errorf("Error selecting pod: %v", err)
 	}

pkg/devspace/services/targetselector/target_selector.go

@@ -218,7 +218,7 @@ func (t *targetSelector) selectSingle(ctx context.Context, client kubectl.Client
 		}
 
 		var out interface{}
-		err := wait.PollImmediate(time.Second, timeout, func() (done bool, err error) {
+		err := wait.PollImmediateWithContext(ctx, time.Second, timeout, func(ctx context.Context) (done bool, err error) {
 			done, o, err := selectFn(ctx, client, options, log)
 			if err != nil {
 				return false, err