test: fix logic errors in restart helper tests

Signed-off-by: Russell Centanni <[email protected]>

Author: lizardruss

e2e/tests/restarthelper/restarthelper.go

@@ -109,10 +109,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 				}
 			}
 
-			if waitSeen && !hasWaitingMessage {
-				break
-			}
-
 			if waitCount > waitMax {
 				break
 			}
@@ -172,7 +168,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 		waitCount := 0
 		waitMax := 3
 		waitingMessage := "(Still waiting...)"
-		startedMessage := "Started with restart helper"
+		startedMessage := "Started with dev command entrypoint"
 		startedSeen := false
 
 		for scanner.Scan() {
@@ -194,10 +190,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 				}
 			}
 
-			if waitSeen && !hasWaitingMessage {
-				break
-			}
-
 			if waitCount > waitMax {
 				break
 			}
@@ -257,9 +249,9 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 		waitCount := 0
 		waitMax := 3
 		waitingMessage := "(Still waiting...)"
-		startedMessage := "Started with restart helper"
+		startedMessage := "Started with dev command entrypoint"
 		startedSeen := false
-		legacyStartedMessage := "Started with restart helper"
+		legacyStartedMessage := "Started with legacy restart helper"
 		legacyStartedSeen := false
 
 		for scanner.Scan() {
@@ -287,10 +279,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 				}
 			}
 
-			if waitSeen && !hasWaitingMessage {
-				break
-			}
-
 			if waitCount > waitMax {
 				break
 			}
@@ -373,10 +361,6 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 				}
 			}
 
-			if waitSeen && !hasWaitingMessage {
-				break
-			}
-
 			if waitCount > waitMax {
 				break
 			}

e2e/tests/restarthelper/testdata/v5/devspace.yaml

@@ -4,6 +4,9 @@ images:
   restart-helper:
     image: john/devbackend
     injectRestartHelper: true
+    build:
+      docker:
+        skipPush: true
 
 deployments:
   - name: restart-helper

e2e/tests/restarthelper/testdata/v6-inject-restart-helper/devspace.yaml

@@ -4,6 +4,7 @@ images:
   restart-helper:
     image: john/devbackend
     injectRestartHelper: true
+    skipPush: true
 
 deployments:
   restart-helper:
@@ -19,7 +20,7 @@ dev:
     command:
       - sh
       - -c
-      - echo 'Started with restart helper' && tail -f /dev/null
+      - echo 'Started with dev command entrypoint' && tail -f /dev/null
     ports:
       - port: 8080
     sync:

e2e/tests/restarthelper/testdata/v6-manual-start/devspace.yaml

@@ -4,6 +4,7 @@ images:
   restart-helper:
     image: john/devbackend
     injectRestartHelper: true
+    skipPush: true
 
 deployments:
   restart-helper:

e2e/tests/restarthelper/testdata/v6/devspace.yaml

@@ -3,6 +3,7 @@ version: v2beta1
 images:
   restart-helper:
     image: john/devbackend
+    skipPush: true
 
 deployments:
   restart-helper:
@@ -18,7 +19,7 @@ dev:
     command:
       - sh
       - -c
-      - echo 'Started with restart helper' && tail -f /dev/null
+      - echo 'Started with dev command entrypoint' && tail -f /dev/null
     ports:
       - port: 8080
     sync: