Skip to content

Commit 82c267f

Browse files
committed
fix: update SSH config test expectations with multiplexing settings
1 parent 0189316 commit 82c267f

1 file changed

Lines changed: 60 additions & 0 deletions

File tree

pkg/ssh/sshconfigurer_test.go

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ Host %s
150150
AddKeysToAgent yes
151151
ForwardAgent yes
152152
RequestTTY yes
153+
ControlMaster auto
154+
ControlPath ~/.ssh/brev-control-%%r@%%h:%%p
155+
ControlPersist 10m
153156
Port 22
154157
155158
Host %s-host
@@ -164,6 +167,9 @@ Host %s-host
164167
AddKeysToAgent yes
165168
ForwardAgent yes
166169
RequestTTY yes
170+
ControlMaster auto
171+
ControlPath ~/.ssh/brev-control-%%r@%%h:%%p
172+
ControlPersist 10m
167173
Port 22
168174
169175
Host %s
@@ -178,6 +184,9 @@ Host %s
178184
AddKeysToAgent yes
179185
ForwardAgent yes
180186
RequestTTY yes
187+
ControlMaster auto
188+
ControlPath ~/.ssh/brev-control-%%r@%%h:%%p
189+
ControlPersist 10m
181190
Port 22
182191
183192
Host %s-host
@@ -192,6 +201,9 @@ Host %s-host
192201
AddKeysToAgent yes
193202
ForwardAgent yes
194203
RequestTTY yes
204+
ControlMaster auto
205+
ControlPath ~/.ssh/brev-control-%%r@%%h:%%p
206+
ControlPersist 10m
195207
Port 22
196208
197209
`, somePlainWorkspaces[0].GetLocalIdentifier(), somePlainWorkspaces[0].GetLocalIdentifier(),
@@ -310,6 +322,9 @@ func Test_makeSSHConfigEntryV2(t *testing.T) { //nolint:funlen // test
310322
AddKeysToAgent yes
311323
ForwardAgent yes
312324
RequestTTY yes
325+
ControlMaster auto
326+
ControlPath ~/.ssh/brev-control-%r@%h:%p
327+
ControlPersist 10m
313328
Port 20
314329
315330
Host testName2-host
@@ -324,6 +339,9 @@ Host testName2-host
324339
AddKeysToAgent yes
325340
ForwardAgent yes
326341
RequestTTY yes
342+
ControlMaster auto
343+
ControlPath ~/.ssh/brev-control-%r@%h:%p
344+
ControlPersist 10m
327345
Port 2022
328346
329347
`,
@@ -359,6 +377,9 @@ Host testName2-host
359377
AddKeysToAgent yes
360378
ForwardAgent yes
361379
RequestTTY yes
380+
ControlMaster auto
381+
ControlPath ~/.ssh/brev-control-%r@%h:%p
382+
ControlPersist 10m
362383
Port 22
363384
364385
Host testName2-host
@@ -373,6 +394,9 @@ Host testName2-host
373394
AddKeysToAgent yes
374395
ForwardAgent yes
375396
RequestTTY yes
397+
ControlMaster auto
398+
ControlPath ~/.ssh/brev-control-%r@%h:%p
399+
ControlPersist 10m
376400
Port 22
377401
378402
`,
@@ -409,6 +433,9 @@ Host testName2-host
409433
AddKeysToAgent yes
410434
ForwardAgent yes
411435
RequestTTY yes
436+
ControlMaster auto
437+
ControlPath ~/.ssh/brev-control-%r@%h:%p
438+
ControlPersist 10m
412439
Port 2022
413440
414441
Host testName2-host
@@ -423,6 +450,9 @@ Host testName2-host
423450
AddKeysToAgent yes
424451
ForwardAgent yes
425452
RequestTTY yes
453+
ControlMaster auto
454+
ControlPath ~/.ssh/brev-control-%r@%h:%p
455+
ControlPersist 10m
426456
Port 22
427457
428458
`,
@@ -457,6 +487,9 @@ Host testName2-host
457487
AddKeysToAgent yes
458488
ForwardAgent yes
459489
RequestTTY yes
490+
ControlMaster auto
491+
ControlPath ~/.ssh/brev-control-%r@%h:%p
492+
ControlPersist 10m
460493
461494
`,
462495
},
@@ -490,6 +523,9 @@ Host testName2-host
490523
AddKeysToAgent yes
491524
ForwardAgent yes
492525
RequestTTY yes
526+
ControlMaster auto
527+
ControlPath ~/.ssh/brev-control-%r@%h:%p
528+
ControlPersist 10m
493529
494530
`,
495531
},
@@ -527,6 +563,9 @@ Host testName2-host
527563
AddKeysToAgent yes
528564
ForwardAgent yes
529565
RequestTTY yes
566+
ControlMaster auto
567+
ControlPath ~/.ssh/brev-control-%r@%h:%p
568+
ControlPersist 10m
530569
531570
Host testName2-host
532571
IdentityFile "/my/priv/key.pem"
@@ -540,6 +579,9 @@ Host testName2-host
540579
AddKeysToAgent yes
541580
ForwardAgent yes
542581
RequestTTY yes
582+
ControlMaster auto
583+
ControlPath ~/.ssh/brev-control-%r@%h:%p
584+
ControlPersist 10m
543585
544586
`,
545587
},
@@ -656,6 +698,9 @@ Host testName1
656698
AddKeysToAgent yes
657699
ForwardAgent yes
658700
RequestTTY yes
701+
ControlMaster auto
702+
ControlPath ~/.ssh/brev-control-%r@%h:%p
703+
ControlPersist 10m
659704
Port 22
660705
661706
Host testName1-host
@@ -670,6 +715,9 @@ Host testName1-host
670715
AddKeysToAgent yes
671716
ForwardAgent yes
672717
RequestTTY yes
718+
ControlMaster auto
719+
ControlPath ~/.ssh/brev-control-%r@%h:%p
720+
ControlPersist 10m
673721
Port 22
674722
675723
`,
@@ -716,6 +764,9 @@ Host testName1
716764
AddKeysToAgent yes
717765
ForwardAgent yes
718766
RequestTTY yes
767+
ControlMaster auto
768+
ControlPath ~/.ssh/brev-control-%r@%h:%p
769+
ControlPersist 10m
719770
Port 22
720771
721772
Host testName1-host
@@ -730,6 +781,9 @@ Host testName1-host
730781
AddKeysToAgent yes
731782
ForwardAgent yes
732783
RequestTTY yes
784+
ControlMaster auto
785+
ControlPath ~/.ssh/brev-control-%r@%h:%p
786+
ControlPersist 10m
733787
Port 22
734788
735789
`,
@@ -747,6 +801,9 @@ Host testName1
747801
AddKeysToAgent yes
748802
ForwardAgent yes
749803
RequestTTY yes
804+
ControlMaster auto
805+
ControlPath ~/.ssh/brev-control-%r@%h:%p
806+
ControlPersist 10m
750807
Port 22
751808
752809
Host testName1-host
@@ -761,6 +818,9 @@ Host testName1-host
761818
AddKeysToAgent yes
762819
ForwardAgent yes
763820
RequestTTY yes
821+
ControlMaster auto
822+
ControlPath ~/.ssh/brev-control-%r@%h:%p
823+
ControlPersist 10m
764824
Port 22
765825
766826
`,

0 commit comments

Comments
 (0)