Skip to content

Commit c7854e8

Browse files
Mia-CrossMia-Cross
committed
remove remaining DisableParallel
1 parent 31cf569 commit c7854e8

File tree

4 files changed

+10
-46
lines changed

4 files changed

+10
-46
lines changed

‎internal/namespaces/instance/v1/custom_ip_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ func Test_IPAttach(t *testing.T) {
2525
AfterFunc: core.AfterFuncCombine(
2626
deleteServer("Server"),
2727
),
28-
DisableParallel: true,
2928
}))
3029

3130
t.Run("With IP", core.Test(&core.TestConfig{
@@ -45,7 +44,6 @@ func Test_IPAttach(t *testing.T) {
4544
AfterFunc: core.AfterFuncCombine(
4645
deleteServer("Server"),
4746
),
48-
DisableParallel: true,
4947
}))
5048
}
5149

@@ -71,7 +69,6 @@ func Test_IPDetach(t *testing.T) {
7169
deleteServer("Server"),
7270
deleteIP("Ip"),
7371
),
74-
DisableParallel: true,
7572
}))
7673

7774
t.Run("With IP", core.Test(&core.TestConfig{
@@ -95,6 +92,5 @@ func Test_IPDetach(t *testing.T) {
9592
deleteServer("Server"),
9693
deleteIP("Ip"),
9794
),
98-
DisableParallel: true,
9995
}))
10096
}

‎internal/namespaces/instance/v1/custom_server_create_test.go‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ func Test_CreateServerErrors(t *testing.T) {
636636
core.TestCheckGolden(),
637637
core.TestCheckExitCode(1),
638638
),
639-
DisableParallel: true,
640639
}))
641640

642641
t.Run("Error: invalid image UUID", core.Test(&core.TestConfig{
@@ -646,7 +645,6 @@ func Test_CreateServerErrors(t *testing.T) {
646645
core.TestCheckGolden(),
647646
core.TestCheckExitCode(1),
648647
),
649-
DisableParallel: true,
650648
}))
651649

652650
////
@@ -659,7 +657,6 @@ func Test_CreateServerErrors(t *testing.T) {
659657
core.TestCheckGolden(),
660658
core.TestCheckExitCode(1),
661659
),
662-
DisableParallel: true,
663660
}))
664661

665662
////
@@ -672,7 +669,6 @@ func Test_CreateServerErrors(t *testing.T) {
672669
core.TestCheckGolden(),
673670
core.TestCheckExitCode(1),
674671
),
675-
DisableParallel: true,
676672
}))
677673

678674
t.Run("Error: invalid total local volumes size: too low 2", core.Test(&core.TestConfig{
@@ -684,7 +680,6 @@ func Test_CreateServerErrors(t *testing.T) {
684680
core.TestCheckGolden(),
685681
core.TestCheckExitCode(1),
686682
),
687-
DisableParallel: true,
688683
}))
689684

690685
t.Run("Error: invalid total local volumes size: too low 3", core.Test(&core.TestConfig{
@@ -695,7 +690,6 @@ func Test_CreateServerErrors(t *testing.T) {
695690
core.TestCheckGolden(),
696691
core.TestCheckExitCode(1),
697692
),
698-
DisableParallel: true,
699693
}))
700694

701695
t.Run("Error: invalid total local volumes size: too high 1", core.Test(&core.TestConfig{
@@ -707,7 +701,6 @@ func Test_CreateServerErrors(t *testing.T) {
707701
core.TestCheckGolden(),
708702
core.TestCheckExitCode(1),
709703
),
710-
DisableParallel: true,
711704
}))
712705

713706
t.Run("Error: invalid total local volumes size: too high 2", core.Test(&core.TestConfig{
@@ -717,7 +710,6 @@ func Test_CreateServerErrors(t *testing.T) {
717710
core.TestCheckGolden(),
718711
core.TestCheckExitCode(1),
719712
),
720-
DisableParallel: true,
721713
}))
722714

723715
t.Run("Error: invalid total local volumes size: too high 3", core.Test(&core.TestConfig{
@@ -730,8 +722,7 @@ func Test_CreateServerErrors(t *testing.T) {
730722
core.TestCheckGolden(),
731723
core.TestCheckExitCode(1),
732724
),
733-
AfterFunc: deleteVolume("Volume"),
734-
DisableParallel: true,
725+
AfterFunc: deleteVolume("Volume"),
735726
}))
736727

737728
t.Run("Error: invalid root volume size", core.Test(&core.TestConfig{
@@ -743,7 +734,6 @@ func Test_CreateServerErrors(t *testing.T) {
743734
core.TestCheckGolden(),
744735
core.TestCheckExitCode(1),
745736
),
746-
DisableParallel: true,
747737
}))
748738

749739
t.Run("Error: disallow existing root volume ID", core.Test(&core.TestConfig{
@@ -754,8 +744,7 @@ func Test_CreateServerErrors(t *testing.T) {
754744
core.TestCheckGolden(),
755745
core.TestCheckExitCode(1),
756746
),
757-
AfterFunc: deleteVolume("Volume"),
758-
DisableParallel: true,
747+
AfterFunc: deleteVolume("Volume"),
759748
}))
760749

761750
t.Run("Error: invalid root volume ID", core.Test(&core.TestConfig{
@@ -767,7 +756,6 @@ func Test_CreateServerErrors(t *testing.T) {
767756
core.TestCheckGolden(),
768757
core.TestCheckExitCode(1),
769758
),
770-
DisableParallel: true,
771759
}))
772760

773761
t.Run("Error: already attached additional volume ID", core.Test(&core.TestConfig{
@@ -785,8 +773,7 @@ func Test_CreateServerErrors(t *testing.T) {
785773
core.TestCheckGolden(),
786774
core.TestCheckExitCode(1),
787775
),
788-
AfterFunc: deleteServer("Server"),
789-
DisableParallel: true,
776+
AfterFunc: deleteServer("Server"),
790777
}))
791778

792779
t.Run("Error: invalid root volume format", core.Test(&core.TestConfig{
@@ -796,7 +783,6 @@ func Test_CreateServerErrors(t *testing.T) {
796783
core.TestCheckGolden(),
797784
core.TestCheckExitCode(1),
798785
),
799-
DisableParallel: true,
800786
}))
801787

802788
t.Run("Error: invalid root volume snapshot ID", core.Test(&core.TestConfig{
@@ -808,7 +794,6 @@ func Test_CreateServerErrors(t *testing.T) {
808794
core.TestCheckGolden(),
809795
core.TestCheckExitCode(1),
810796
),
811-
DisableParallel: true,
812797
}))
813798

814799
t.Run("Error: invalid additional volume snapshot ID", core.Test(&core.TestConfig{
@@ -820,7 +805,6 @@ func Test_CreateServerErrors(t *testing.T) {
820805
core.TestCheckGolden(),
821806
core.TestCheckExitCode(1),
822807
),
823-
DisableParallel: true,
824808
}))
825809

826810
////
@@ -906,7 +890,6 @@ func Test_CreateServerScratchStorage(t *testing.T) {
906890
AfterFunc: core.ExecAfterCmd(
907891
"scw instance server delete {{ .CmdResult.ID }} zone=fr-par-2 with-volumes=all with-ip=true force-shutdown=true",
908892
),
909-
DisableParallel: true,
910893
}))
911894
}
912895

@@ -940,6 +923,5 @@ func Test_AttachFilesystem(t *testing.T) {
940923
"scw file filesystem delete {{ .FileSystem.ID }}",
941924
),
942925
),
943-
DisableParallel: true,
944926
}))
945927
}

‎internal/namespaces/instance/v1/custom_server_ssh_test.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ func Test_ServerSSH(t *testing.T) {
2323
core.TestCheckGolden(),
2424
core.TestCheckExitCode(0),
2525
),
26-
AfterFunc: deleteServer("Server"),
27-
DisableParallel: true,
26+
AfterFunc: deleteServer("Server"),
2827
}))
2928

3029
t.Run("With-Exit-Code", core.Test(&core.TestConfig{
@@ -42,8 +41,7 @@ func Test_ServerSSH(t *testing.T) {
4241
core.TestCheckGolden(),
4342
core.TestCheckExitCode(130),
4443
),
45-
AfterFunc: deleteServer("Server"),
46-
DisableParallel: true,
44+
AfterFunc: deleteServer("Server"),
4745
}))
4846

4947
t.Run("Stopped server", core.Test(&core.TestConfig{
@@ -54,7 +52,6 @@ func Test_ServerSSH(t *testing.T) {
5452
core.TestCheckGolden(),
5553
core.TestCheckExitCode(1),
5654
),
57-
AfterFunc: deleteServer("Server"),
58-
DisableParallel: true,
55+
AfterFunc: deleteServer("Server"),
5956
}))
6057
}

‎internal/namespaces/instance/v1/custom_server_test.go‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
4343
testAttachVolumeServerSBSVolumeSize("0", 10),
4444
testAttachVolumeServerSBSVolumeSize("1", 10),
4545
),
46-
AfterFunc: deleteServer("Server"),
47-
DisableParallel: true,
46+
AfterFunc: deleteServer("Server"),
4847
}))
4948

5049
t.Run("simple local volume", core.Test(&core.TestConfig{
@@ -70,8 +69,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
7069
},
7170
testAttachVolumeServerSBSVolumeSize("0", 10),
7271
),
73-
AfterFunc: deleteServer("Server"),
74-
DisableParallel: true,
72+
AfterFunc: deleteServer("Server"),
7573
}))
7674

7775
t.Run("invalid volume UUID", core.Test(&core.TestConfig{
@@ -82,8 +80,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
8280
core.TestCheckGolden(),
8381
core.TestCheckExitCode(1),
8482
),
85-
AfterFunc: deleteServer("Server"),
86-
DisableParallel: true,
83+
AfterFunc: deleteServer("Server"),
8784
}))
8885
})
8986
t.Run("Detach", func(t *testing.T) {
@@ -116,7 +113,6 @@ func Test_ServerVolumeUpdate(t *testing.T) {
116113
core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "1").ID }}`),
117114
deleteServer("Server"),
118115
),
119-
DisableParallel: true,
120116
}))
121117

122118
t.Run("invalid volume UUID", core.Test(&core.TestConfig{
@@ -127,8 +123,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
127123
core.TestCheckGolden(),
128124
core.TestCheckExitCode(1),
129125
),
130-
AfterFunc: deleteServer("Server"),
131-
DisableParallel: true,
126+
AfterFunc: deleteServer("Server"),
132127
}))
133128
})
134129
}
@@ -339,7 +334,6 @@ func Test_ServerDelete(t *testing.T) {
339334
core.TestCheckGolden(),
340335
core.TestCheckExitCode(0),
341336
),
342-
DisableParallel: true,
343337
}))
344338

345339
t.Run("only block volumes", core.Test(&core.TestConfig{
@@ -356,7 +350,6 @@ func Test_ServerDelete(t *testing.T) {
356350
AfterFunc: core.ExecAfterCmd(
357351
`scw instance volume delete {{ (index .Server.Volumes "0").ID }}`,
358352
),
359-
DisableParallel: true,
360353
}))
361354

362355
t.Run("only local volumes", core.Test(&core.TestConfig{
@@ -379,7 +372,6 @@ func Test_ServerDelete(t *testing.T) {
379372
),
380373
core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "1").ID }}`),
381374
),
382-
DisableParallel: true,
383375
}))
384376

385377
t.Run("with none volumes", core.Test(&core.TestConfig{
@@ -409,7 +401,6 @@ func Test_ServerDelete(t *testing.T) {
409401
core.ExecAfterCmd(`scw instance volume delete {{ (index .Server.Volumes "0").ID }}`),
410402
core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "1").ID }}`),
411403
),
412-
DisableParallel: true,
413404
}))
414405

415406
t.Run("with sbs volumes", func(t *testing.T) {
@@ -447,7 +438,6 @@ func Test_ServerDelete(t *testing.T) {
447438
assert.Error(t, err, "%v", resp)
448439
},
449440
),
450-
DisableParallel: true,
451441
})
452442
})
453443

@@ -474,7 +464,6 @@ func Test_ServerDelete(t *testing.T) {
474464
}
475465
},
476466
),
477-
DisableParallel: true,
478467
}))
479468

480469
interactive.IsInteractive = false

0 commit comments

Comments
 (0)