Skip to content

Commit e4a8f60

Browse files
committed
test:fix: age expectation regex for minutes-no-seconds (42m)
Signed-off-by: Marc Nuri <[email protected]>
1 parent 7963338 commit e4a8f60

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pkg/mcp/namespaces_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestNamespacesListAsTable(t *testing.T) {
9292
"(?<kind>Namespace)\\s+" +
9393
"(?<name>ns-1)\\s+" +
9494
"(?<status>Active)\\s+" +
95-
"(?<age>(\\d+m)?\\d+s)\\s+" +
95+
"(?<age>(\\d+m)?(\\d+s)?)\\s+" +
9696
"(?<labels>kubernetes.io/metadata.name=ns-1)"
9797
if m, e := regexp.MatchString(expectedRow, out); !m || e != nil {
9898
t.Fatalf("Expected row '%s' not found in output:\n%s", expectedRow, out)
@@ -103,7 +103,7 @@ func TestNamespacesListAsTable(t *testing.T) {
103103
"(?<kind>Namespace)\\s+" +
104104
"(?<name>ns-2)\\s+" +
105105
"(?<status>Active)\\s+" +
106-
"(?<age>(\\d+m)?\\d+s)\\s+" +
106+
"(?<age>(\\d+m)?(\\d+s)?)\\s+" +
107107
"(?<labels>kubernetes.io/metadata.name=ns-2)"
108108
if m, e := regexp.MatchString(expectedRow, out); !m || e != nil {
109109
t.Fatalf("Expected row '%s' not found in output:\n%s", expectedRow, out)

pkg/mcp/pods_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func TestPodsListAsTable(t *testing.T) {
241241
"(?<ready>0\\/1)\\s+" +
242242
"(?<status>Pending)\\s+" +
243243
"(?<restarts>0)\\s+" +
244-
"(?<age>(\\d+m)?\\d+s)\\s+" +
244+
"(?<age>(\\d+m)?(\\d+s)?)\\s+" +
245245
"(?<ip><none>)\\s+" +
246246
"(?<node><none>)\\s+" +
247247
"(?<nominated_node><none>)\\s+" +
@@ -259,7 +259,7 @@ func TestPodsListAsTable(t *testing.T) {
259259
"(?<ready>0\\/1)\\s+" +
260260
"(?<status>Pending)\\s+" +
261261
"(?<restarts>0)\\s+" +
262-
"(?<age>(\\d+m)?\\d+s)\\s+" +
262+
"(?<age>(\\d+m)?(\\d+s)?)\\s+" +
263263
"(?<ip><none>)\\s+" +
264264
"(?<node><none>)\\s+" +
265265
"(?<nominated_node><none>)\\s+" +
@@ -302,7 +302,7 @@ func TestPodsListAsTable(t *testing.T) {
302302
"(?<ready>0\\/1)\\s+" +
303303
"(?<status>Pending)\\s+" +
304304
"(?<restarts>0)\\s+" +
305-
"(?<age>(\\d+m)?\\d+s)\\s+" +
305+
"(?<age>(\\d+m)?(\\d+s)?)\\s+" +
306306
"(?<ip><none>)\\s+" +
307307
"(?<node><none>)\\s+" +
308308
"(?<nominated_node><none>)\\s+" +

pkg/mcp/resources_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func TestResourcesListAsTable(t *testing.T) {
223223
"(?<kind>ConfigMap)\\s+" +
224224
"(?<name>a-configmap-to-list-as-table)\\s+" +
225225
"(?<data>1)\\s+" +
226-
"(?<age>(\\d+m)?\\d+s)\\s+" +
226+
"(?<age>(\\d+m)?(\\d+s)?)\\s+" +
227227
"(?<labels>resource=config-map)"
228228
if m, e := regexp.MatchString(expectedRow, outConfigMapList); !m || e != nil {
229229
t.Fatalf("Expected row '%s' not found in output:\n%s", expectedRow, outConfigMapList)
@@ -261,7 +261,7 @@ func TestResourcesListAsTable(t *testing.T) {
261261
"(?<apiVersion>route.openshift.io/v1)\\s+" +
262262
"(?<kind>Route)\\s+" +
263263
"(?<name>an-openshift-route-to-list-as-table)\\s+" +
264-
"(?<age>(\\d+m)?\\d+s)\\s+" +
264+
"(?<age>(\\d+m)?(\\d+s)?)\\s+" +
265265
"(?<labels><none>)"
266266
if m, e := regexp.MatchString(expectedRow, outRouteList); !m || e != nil {
267267
t.Fatalf("Expected row '%s' not found in output:\n%s", expectedRow, outRouteList)

0 commit comments

Comments
 (0)