File tree Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ func TestNamespacesListAsTable(t *testing.T) {
92
92
"(?<kind>Namespace)\\ s+" +
93
93
"(?<name>ns-1)\\ s+" +
94
94
"(?<status>Active)\\ s+" +
95
- "(?<age>(\\ d+m)?\\ d+s)\\ s+" +
95
+ "(?<age>(\\ d+m)?( \\ d+s)? )\\ s+" +
96
96
"(?<labels>kubernetes.io/metadata.name=ns-1)"
97
97
if m , e := regexp .MatchString (expectedRow , out ); ! m || e != nil {
98
98
t .Fatalf ("Expected row '%s' not found in output:\n %s" , expectedRow , out )
@@ -103,7 +103,7 @@ func TestNamespacesListAsTable(t *testing.T) {
103
103
"(?<kind>Namespace)\\ s+" +
104
104
"(?<name>ns-2)\\ s+" +
105
105
"(?<status>Active)\\ s+" +
106
- "(?<age>(\\ d+m)?\\ d+s)\\ s+" +
106
+ "(?<age>(\\ d+m)?( \\ d+s)? )\\ s+" +
107
107
"(?<labels>kubernetes.io/metadata.name=ns-2)"
108
108
if m , e := regexp .MatchString (expectedRow , out ); ! m || e != nil {
109
109
t .Fatalf ("Expected row '%s' not found in output:\n %s" , expectedRow , out )
Original file line number Diff line number Diff line change @@ -241,7 +241,7 @@ func TestPodsListAsTable(t *testing.T) {
241
241
"(?<ready>0\\ /1)\\ s+" +
242
242
"(?<status>Pending)\\ s+" +
243
243
"(?<restarts>0)\\ s+" +
244
- "(?<age>(\\ d+m)?\\ d+s)\\ s+" +
244
+ "(?<age>(\\ d+m)?( \\ d+s)? )\\ s+" +
245
245
"(?<ip><none>)\\ s+" +
246
246
"(?<node><none>)\\ s+" +
247
247
"(?<nominated_node><none>)\\ s+" +
@@ -259,7 +259,7 @@ func TestPodsListAsTable(t *testing.T) {
259
259
"(?<ready>0\\ /1)\\ s+" +
260
260
"(?<status>Pending)\\ s+" +
261
261
"(?<restarts>0)\\ s+" +
262
- "(?<age>(\\ d+m)?\\ d+s)\\ s+" +
262
+ "(?<age>(\\ d+m)?( \\ d+s)? )\\ s+" +
263
263
"(?<ip><none>)\\ s+" +
264
264
"(?<node><none>)\\ s+" +
265
265
"(?<nominated_node><none>)\\ s+" +
@@ -302,7 +302,7 @@ func TestPodsListAsTable(t *testing.T) {
302
302
"(?<ready>0\\ /1)\\ s+" +
303
303
"(?<status>Pending)\\ s+" +
304
304
"(?<restarts>0)\\ s+" +
305
- "(?<age>(\\ d+m)?\\ d+s)\\ s+" +
305
+ "(?<age>(\\ d+m)?( \\ d+s)? )\\ s+" +
306
306
"(?<ip><none>)\\ s+" +
307
307
"(?<node><none>)\\ s+" +
308
308
"(?<nominated_node><none>)\\ s+" +
Original file line number Diff line number Diff line change @@ -223,7 +223,7 @@ func TestResourcesListAsTable(t *testing.T) {
223
223
"(?<kind>ConfigMap)\\ s+" +
224
224
"(?<name>a-configmap-to-list-as-table)\\ s+" +
225
225
"(?<data>1)\\ s+" +
226
- "(?<age>(\\ d+m)?\\ d+s)\\ s+" +
226
+ "(?<age>(\\ d+m)?( \\ d+s)? )\\ s+" +
227
227
"(?<labels>resource=config-map)"
228
228
if m , e := regexp .MatchString (expectedRow , outConfigMapList ); ! m || e != nil {
229
229
t .Fatalf ("Expected row '%s' not found in output:\n %s" , expectedRow , outConfigMapList )
@@ -261,7 +261,7 @@ func TestResourcesListAsTable(t *testing.T) {
261
261
"(?<apiVersion>route.openshift.io/v1)\\ s+" +
262
262
"(?<kind>Route)\\ s+" +
263
263
"(?<name>an-openshift-route-to-list-as-table)\\ s+" +
264
- "(?<age>(\\ d+m)?\\ d+s)\\ s+" +
264
+ "(?<age>(\\ d+m)?( \\ d+s)? )\\ s+" +
265
265
"(?<labels><none>)"
266
266
if m , e := regexp .MatchString (expectedRow , outRouteList ); ! m || e != nil {
267
267
t .Fatalf ("Expected row '%s' not found in output:\n %s" , expectedRow , outRouteList )
You can’t perform that action at this time.
0 commit comments