Skip to content

Commit 329698f

Browse files
committed
test(output): improve age regex
1 parent 3fcace5 commit 329698f

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
@@ -72,7 +72,7 @@ func TestNamespacesListAsTable(t *testing.T) {
7272
"(?<kind>Namespace)\\s+" +
7373
"(?<name>ns-1)\\s+" +
7474
"(?<status>Active)\\s+" +
75-
"(?<age>\\d+(s|m))\\s+" +
75+
"(?<age>(\\d+m)?\\d+s)\\s+" +
7676
"(?<labels>kubernetes.io/metadata.name=ns-1)"
7777
if m, e := regexp.MatchString(expectedRow, out); !m || e != nil {
7878
t.Fatalf("Expected row '%s' not found in output:\n%s", expectedRow, out)
@@ -83,7 +83,7 @@ func TestNamespacesListAsTable(t *testing.T) {
8383
"(?<kind>Namespace)\\s+" +
8484
"(?<name>ns-2)\\s+" +
8585
"(?<status>Active)\\s+" +
86-
"(?<age>\\d+(s|m))\\s+" +
86+
"(?<age>(\\d+m)?\\d+s)\\s+" +
8787
"(?<labels>kubernetes.io/metadata.name=ns-2)"
8888
if m, e := regexp.MatchString(expectedRow, out); !m || e != nil {
8989
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
@@ -209,7 +209,7 @@ func TestPodsListAsTable(t *testing.T) {
209209
"(?<ready>0\\/1)\\s+" +
210210
"(?<status>Pending)\\s+" +
211211
"(?<restarts>0)\\s+" +
212-
"(?<age>\\d+(s|m))\\s+" +
212+
"(?<age>(\\d+m)?\\d+s)\\s+" +
213213
"(?<ip><none>)\\s+" +
214214
"(?<node><none>)\\s+" +
215215
"(?<nominated_node><none>)\\s+" +
@@ -227,7 +227,7 @@ func TestPodsListAsTable(t *testing.T) {
227227
"(?<ready>0\\/1)\\s+" +
228228
"(?<status>Pending)\\s+" +
229229
"(?<restarts>0)\\s+" +
230-
"(?<age>\\d+(s|m))\\s+" +
230+
"(?<age>(\\d+m)?\\d+s)\\s+" +
231231
"(?<ip><none>)\\s+" +
232232
"(?<node><none>)\\s+" +
233233
"(?<nominated_node><none>)\\s+" +
@@ -270,7 +270,7 @@ func TestPodsListAsTable(t *testing.T) {
270270
"(?<ready>0\\/1)\\s+" +
271271
"(?<status>Pending)\\s+" +
272272
"(?<restarts>0)\\s+" +
273-
"(?<age>\\d+(s|m))\\s+" +
273+
"(?<age>(\\d+m)?\\d+s)\\s+" +
274274
"(?<ip><none>)\\s+" +
275275
"(?<node><none>)\\s+" +
276276
"(?<nominated_node><none>)\\s+" +

pkg/mcp/resources_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func TestResourcesListAsTable(t *testing.T) {
178178
"(?<kind>ConfigMap)\\s+" +
179179
"(?<name>a-configmap-to-list-as-table)\\s+" +
180180
"(?<data>1)\\s+" +
181-
"(?<age>\\d+(s|m))\\s+" +
181+
"(?<age>(\\d+m)?\\d+s)\\s+" +
182182
"(?<labels>resource=config-map)"
183183
if m, e := regexp.MatchString(expectedRow, outConfigMapList); !m || e != nil {
184184
t.Fatalf("Expected row '%s' not found in output:\n%s", expectedRow, outConfigMapList)
@@ -216,7 +216,7 @@ func TestResourcesListAsTable(t *testing.T) {
216216
"(?<apiVersion>route.openshift.io/v1)\\s+" +
217217
"(?<kind>Route)\\s+" +
218218
"(?<name>an-openshift-route-to-list-as-table)\\s+" +
219-
"(?<age>\\d+(s|m))\\s+" +
219+
"(?<age>(\\d+m)?\\d+s)\\s+" +
220220
"(?<labels><none>)"
221221
if m, e := regexp.MatchString(expectedRow, outRouteList); !m || e != nil {
222222
t.Fatalf("Expected row '%s' not found in output:\n%s", expectedRow, outRouteList)

0 commit comments

Comments
 (0)