Merge pull request #9680 from bfournie/ibi-unit-test-fix

openshift-merge-bot[bot] · web-flow · commit 0b51991c838f · 2025-04-28T20:26:43.000Z
no-jira: IBI nmstate unit test fix
diff --git a/pkg/asset/imagebased/configimage/imagebased_config_test.go b/pkg/asset/imagebased/configimage/imagebased_config_test.go
@@ -95,7 +95,7 @@ networkConfig:
       state: invalid`,
 
 			expectedFound: false,
-			expectedError: "networkConfig: Invalid value: interfaces:\n- name: eth0\n  state: invalid\n  type: ethernet\n: failed to execute 'nmstatectl gc', error: InvalidArgument: Invalid YAML string: interfaces: unknown variant `invalid`",
+			expectedError: "interfaces: unknown variant `invalid`",
 		},
 		{
 			name: "invalid-additional-ntp-sources",
diff --git a/pkg/asset/imagebased/image/imagebased_config_test.go b/pkg/asset/imagebased/image/imagebased_config_test.go
@@ -216,7 +216,7 @@ networkConfig:
 `,
 
 			expectedFound: false,
-			expectedError: "networkConfig: Invalid value: invalid: config\n: failed to execute 'nmstatectl gc', error: InvalidArgument: Invalid YAML string: unknown field `invalid`",
+			expectedError: "unknown field `invalid`",
 		},
 		{
 			name: "empty networkConfig",

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ networkConfig:`
`95`	`95`	state: invalid`,
`96`	`96`
`97`	`97`	`expectedFound: false,`
`98`		- expectedError: "networkConfig: Invalid value: interfaces:\n- name: eth0\n state: invalid\n type: ethernet\n: failed to execute 'nmstatectl gc', error: InvalidArgument: Invalid YAML string: interfaces: unknown variant `invalid`",
	`98`	+ expectedError: "interfaces: unknown variant `invalid`",
`99`	`99`	`},`
`100`	`100`	`{`
`101`	`101`	`name: "invalid-additional-ntp-sources",`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ networkConfig:`
`216`	`216`	`,
`217`	`217`
`218`	`218`	`expectedFound: false,`
`219`		- expectedError: "networkConfig: Invalid value: invalid: config\n: failed to execute 'nmstatectl gc', error: InvalidArgument: Invalid YAML string: unknown field `invalid`",
	`219`	+ expectedError: "unknown field `invalid`",
`220`	`220`	`},`
`221`	`221`	`{`
`222`	`222`	`name: "empty networkConfig",`