Repository navigation
Commit 50a93d9
committed
test: fix Windows-only failures in cross-OS contract tests
Address Windows CI failures introduced by previous contract-test
commits. None of the contracts themselves were wrong — only the
test expectations baked in POSIX assumptions (forward-slash paths,
LF-only multi-doc separators, and strvals.ParseInto behaviour on
drive-letter paths).
Fixes:
- pkg/commands/root_detection_test.go: TestContract_ResolveSecretsPath
builds expected values via filepath.Join so the OS-native
separator matches on Windows.
- pkg/commands/contract_root_dispatch_test.go:
* TestContract_CheckRootConflict_ExplicitConflict: uses
filepath.Abs of the path arguments for the substring assertion
(Windows resolves /explicit/root to D:\explicit\root).
* TestContract_EnsureTalosconfigPath_*: builds expected via
filepath.Join.
- pkg/engine/contract_loadvalues_test.go:
TestContract_LoadValues_SetFileReadsContent skips on Windows.
strvals.ParseInto interprets ':' and '\\' in Windows temp
paths as separators, splitting the path into multiple keys.
The contract holds; the test fixture cannot be expressed
cross-platform.
- pkg/engine/contract_schema_test.go:
* TestContract_Schema_Versions112AndLaterRenderMultidoc matches
the literal '---' token instead of '\n---\n' so CRLF-rendered
output on Windows still satisfies the contract.
* TestContract_Schema_LegacyIsSingleDocument scans line-by-line
with TrimRight on \r so a CRLF '---' line is also caught.
Assisted-By: Claude <[email protected]>
Signed-off-by: Aleksei Sviridkin <[email protected]>1 parent d0daf83 commit 50a93d9
4 files changed
Lines changed: 60 additions & 26 deletions
File tree
- pkg
- commands
- engine
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
239 | 239 | | |
240 | 240 | | |
241 | 241 | | |
242 | | - | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
243 | 246 | | |
244 | 247 | | |
245 | | - | |
246 | | - | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
247 | 252 | | |
248 | 253 | | |
249 | 254 | | |
250 | | - | |
251 | | - | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
252 | 259 | | |
253 | 260 | | |
254 | 261 | | |
| |||
436 | 443 | | |
437 | 444 | | |
438 | 445 | | |
439 | | - | |
| 446 | + | |
| 447 | + | |
440 | 448 | | |
441 | 449 | | |
442 | 450 | | |
443 | 451 | | |
444 | 452 | | |
445 | | - | |
| 453 | + | |
| 454 | + | |
446 | 455 | | |
447 | 456 | | |
448 | 457 | | |
449 | 458 | | |
450 | | - | |
451 | | - | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
452 | 462 | | |
453 | 463 | | |
454 | 464 | | |
| |||
461 | 471 | | |
462 | 472 | | |
463 | 473 | | |
464 | | - | |
| 474 | + | |
| 475 | + | |
465 | 476 | | |
466 | 477 | | |
467 | 478 | | |
468 | | - | |
469 | | - | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
470 | 482 | | |
471 | 483 | | |
472 | 484 | | |
| |||
477 | 489 | | |
478 | 490 | | |
479 | 491 | | |
480 | | - | |
481 | | - | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
482 | 495 | | |
483 | 496 | | |
484 | | - | |
485 | | - | |
| 497 | + | |
| 498 | + | |
486 | 499 | | |
487 | 500 | | |
488 | 501 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
155 | | - | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
156 | 158 | | |
157 | 159 | | |
158 | 160 | | |
159 | | - | |
| 161 | + | |
| 162 | + | |
160 | 163 | | |
161 | 164 | | |
162 | 165 | | |
163 | 166 | | |
164 | 167 | | |
165 | 168 | | |
166 | | - | |
167 | | - | |
168 | | - | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
169 | 172 | | |
170 | 173 | | |
171 | 174 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
250 | 251 | | |
251 | 252 | | |
252 | 253 | | |
253 | | - | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
254 | 257 | | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
255 | 261 | | |
256 | 262 | | |
257 | 263 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
105 | | - | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
106 | 110 | | |
107 | 111 | | |
108 | 112 | | |
| |||
137 | 141 | | |
138 | 142 | | |
139 | 143 | | |
140 | | - | |
141 | | - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
142 | 154 | | |
143 | 155 | | |
144 | 156 | | |
| |||
0 commit comments