Merge pull request openshift#7954 from andfasano/fix-nmstate-error-msg

openshift-merge-bot[bot] · web-flow · commit 26c28d74fdf8 · 2024-01-26T20:54:56.000Z
NO-ISSUE: test fix to support slightly different nmstate error messages
diff --git a/pkg/asset/agent/image/ignition_test.go b/pkg/asset/agent/image/ignition_test.go
@@ -155,7 +155,7 @@ func TestIgnition_addStaticNetworkConfig(t *testing.T) {
 					NetworkYaml: "interfaces:\n- ipv4:\n    address:\n    - ip: bad-ip\n      prefix-length: 24\n    enabled: true\n  mac-address: 52:54:01:aa:aa:a1\n  name: eth0\n  state: up\n  type: ethernet\n",
 				},
 			},
-			expectedError:    "failed to create StaticNetwork config data: failed to create static config for host 0: failed to execute 'nmstatectl gc', error: invalid IP address syntax",
+			expectedError:    ".*invalid IP address syntax",
 			expectedFileList: nil,
 		},
 	}

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func TestIgnition_addStaticNetworkConfig(t *testing.T) {`
`155`	`155`	`NetworkYaml: "interfaces:\n- ipv4:\n address:\n - ip: bad-ip\n prefix-length: 24\n enabled: true\n mac-address: 52:54:01:aa:aa:a1\n name: eth0\n state: up\n type: ethernet\n",`
`156`	`156`	`},`
`157`	`157`	`},`
`158`		`- expectedError: "failed to create StaticNetwork config data: failed to create static config for host 0: failed to execute 'nmstatectl gc', error: invalid IP address syntax",`
	`158`	`+ expectedError: ".*invalid IP address syntax",`
`159`	`159`	`expectedFileList: nil,`
`160`	`160`	`},`
`161`	`161`	`}`