Skip to content

Commit 6d9cb35

Browse files
committed
Tweak tests to ignore int64 CRD warning
Signed-off-by: liamfallon <[email protected]>
1 parent 9fb9a4b commit 6d9cb35

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

e2e/live/end-to-end-test.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ function assertKptLiveApplyEquals {
260260
function processKptLiveOutput {
261261
trimTrailingNewlines | \
262262
filterReconcilePending | \
263-
filterUnknownFieldsWarning | \
263+
filterWarning | \
264264
sortReconcileEvents | \
265265
sortActuationEvents
266266
}
@@ -270,10 +270,11 @@ function trimTrailingNewlines {
270270
}
271271

272272
function filterReconcilePending {
273-
grep -v " reconcile pending$" || true
273+
grep -v " reconcile pending$" | \
274+
grep -v " unrecognized format .*int64.*$" || true
274275
}
275276

276-
function filterUnknownFieldsWarning {
277+
function filterWarning {
277278
grep -v " unknown field" || true
278279
}
279280

@@ -709,7 +710,7 @@ kubectl get resourcegroups.kpt.dev 2>&1 | tee $OUTPUT_DIR/status
709710
assertContains "error: the server doesn't have a resource type \"resourcegroups\""
710711
# Next, add the ResourceGroup CRD
711712
echo "kpt live install-resource-group"
712-
${BIN_DIR}/kpt live install-resource-group 2>&1 | tee $OUTPUT_DIR/status
713+
${BIN_DIR}/kpt live install-resource-group 2> /dev/null | tee $OUTPUT_DIR/status
713714
assertContains "installing inventory ResourceGroup CRD...success"
714715
echo "kubectl get resourcegroups.kpt.dev"
715716
kubectl get resourcegroups.kpt.dev 2>&1 | tee $OUTPUT_DIR/status
@@ -723,7 +724,7 @@ kubectl get resourcegroups.kpt.dev --no-headers 2>&1 | tee $OUTPUT_DIR/status
723724
assertContains "example-inventory"
724725
# Finally, add the ResourceGroup CRD again, and check it says it already exists.
725726
echo "kpt live install-resource-group"
726-
${BIN_DIR}/kpt live install-resource-group 2>&1 | tee $OUTPUT_DIR/status
727+
${BIN_DIR}/kpt live install-resource-group 2> /dev/null | tee $OUTPUT_DIR/status
727728
assertContains "...success"
728729
printResult
729730

0 commit comments

Comments
 (0)