Skip to content

Commit caa0bb3

Browse files
fixed e2e tests
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
1 parent 7541fde commit caa0bb3

5 files changed

Lines changed: 8 additions & 10 deletions

File tree

e2e/testdata/live-apply/apply-depends-on/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kptArgs:
1919
- "apply"
2020
- "--reconcile-timeout=2m"
2121

22-
stdOut: |
22+
stdErr: |
2323
inventory update started
2424
inventory update finished
2525
apply phase started

e2e/testdata/live-apply/crd-and-cr/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kptArgs:
1919
- "apply"
2020
- "--reconcile-timeout=1m"
2121

22-
stdOut: |
22+
stdErr: |
2323
inventory update started
2424
inventory update finished
2525
apply phase started

e2e/testdata/live-apply/dry-run-with-install-rg/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ kptArgs:
1919
- "apply"
2020
- "--dry-run"
2121
- "--install-resource-group"
22-
stdOut: |
23-
deployment.apps/nginx-deployment created
24-
1 resource(s) applied. 1 created, 0 unchanged, 0 configured, 0 failed
2522
stdErr: |
2623
installing inventory ResourceGroup CRD.
24+
Dry-run strategy: server
25+
deployment.apps/nginx-deployment created
26+
1 resource(s) applied. 1 created, 0 unchanged, 0 configured, 0 failed
2727
exitCode: 0

e2e/testdata/live-apply/install-rg-on-apply/config.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ kptArgs:
1818
- "live"
1919
- "apply"
2020
- "--reconcile-timeout=1m"
21-
stdOut: |
22-
deployment.apps/nginx-deployment created
23-
1 resource(s) applied. 1 created, 0 unchanged, 0 configured, 0 failed
2421
stdErr: |
2522
installing inventory ResourceGroup CRD.
23+
deployment.apps/nginx-deployment created
24+
1 resource(s) applied. 1 created, 0 unchanged, 0 configured, 0 failed
2625
inventory:
2726
- group: apps
2827
kind: Deployment

e2e/testdata/live-apply/prune-depends-on/config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kptArgs:
1919
- "apply"
2020
- "--reconcile-timeout=1m"
2121

22-
stdOut: |
22+
stdErr: |
2323
inventory update started
2424
inventory update finished
2525
apply phase started
@@ -46,7 +46,6 @@ stdOut: |
4646
prune result: 2 attempted, 2 successful, 0 skipped, 0 failed
4747
reconcile result: 3 attempted, 3 successful, 0 skipped, 0 failed, 0 timed out
4848
49-
5049
optionalStdOut:
5150
- configmap/cm reconcile pending
5251
- deployment.apps/second-nginx reconcile pending

0 commit comments

Comments
 (0)