From 7e80edd3aaef133c795fdeff9b8d0389168c2ab1 Mon Sep 17 00:00:00 2001 From: Toshiki Sonoda Date: Mon, 30 Jan 2023 11:45:34 +0900 Subject: [PATCH] e2e: Avoid hard-coding included in quadlet test Use .*/podman_test.*... instead of /tmp/podman_test.*... Signed-off-by: Toshiki Sonoda --- test/e2e/quadlet/basic.kube | 4 ++-- test/e2e/quadlet_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/quadlet/basic.kube b/test/e2e/quadlet/basic.kube index 727ab84a56..b186efc538 100644 --- a/test/e2e/quadlet/basic.kube +++ b/test/e2e/quadlet/basic.kube @@ -1,11 +1,11 @@ ## assert-podman-args "kube" ## assert-podman-args "play" -## assert-podman-final-args-regex /tmp/podman_test.*/quadlet/deployment.yml +## assert-podman-final-args-regex .*/podman_test.*/quadlet/deployment.yml ## assert-podman-args "--replace" ## assert-podman-args "--service-container=true" ## assert-podman-stop-args "kube" ## assert-podman-stop-args "down" -## assert-podman-stop-final-args-regex /tmp/podman_test.*/quadlet/deployment.yml +## assert-podman-stop-final-args-regex .*/podman_test.*/quadlet/deployment.yml ## assert-key-is "Unit" "RequiresMountsFor" "%t/containers" ## assert-key-is "Service" "KillMode" "mixed" ## assert-key-is "Service" "Type" "notify" diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go index 69324720c2..7cd1a31a06 100644 --- a/test/e2e/quadlet_test.go +++ b/test/e2e/quadlet_test.go @@ -390,12 +390,12 @@ var _ = Describe("quadlet system generator", func() { "---basic.service---", "## assert-podman-args \"kube\"", "## assert-podman-args \"play\"", - "## assert-podman-final-args-regex /tmp/podman_test.*/quadlet/deployment.yml", + "## assert-podman-final-args-regex .*/podman_test.*/quadlet/deployment.yml", "## assert-podman-args \"--replace\"", "## assert-podman-args \"--service-container=true\"", "## assert-podman-stop-args \"kube\"", "## assert-podman-stop-args \"down\"", - "## assert-podman-stop-final-args-regex /tmp/podman_test.*/quadlet/deployment.yml", + "## assert-podman-stop-final-args-regex .*/podman_test.*/quadlet/deployment.yml", "## assert-key-is \"Unit\" \"RequiresMountsFor\" \"%t/containers\"", "## assert-key-is \"Service\" \"KillMode\" \"mixed\"", "## assert-key-is \"Service\" \"Type\" \"notify\"",