Skip to content

Commit c52a181

Browse files
Mia-CrossMia-Cross
committed
remove remaining DisableParallel
1 parent d34eefe commit c52a181

File tree

4 files changed

+12
-46
lines changed

4 files changed

+12
-46
lines changed

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

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

3131
t.Run("With IP", core.Test(&core.TestConfig{
@@ -45,7 +45,7 @@ func Test_IPAttach(t *testing.T) {
4545
AfterFunc: core.AfterFuncCombine(
4646
deleteServer("Server"),
4747
),
48-
DisableParallel: true,
48+
//DisableParallel: true,
4949
}))
5050
}
5151

@@ -71,7 +71,6 @@ func Test_IPDetach(t *testing.T) {
7171
deleteServer("Server"),
7272
deleteIP("Ip"),
7373
),
74-
DisableParallel: true,
7574
}))
7675

7776
t.Run("With IP", core.Test(&core.TestConfig{
@@ -95,6 +94,5 @@ func Test_IPDetach(t *testing.T) {
9594
deleteServer("Server"),
9695
deleteIP("Ip"),
9796
),
98-
DisableParallel: true,
9997
}))
10098
}

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

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

641640
t.Run("Error: invalid image UUID", core.Test(&core.TestConfig{
@@ -645,7 +644,6 @@ func Test_CreateServerErrors(t *testing.T) {
645644
core.TestCheckGolden(),
646645
core.TestCheckExitCode(1),
647646
),
648-
DisableParallel: true,
649647
}))
650648

651649
////
@@ -658,7 +656,6 @@ func Test_CreateServerErrors(t *testing.T) {
658656
core.TestCheckGolden(),
659657
core.TestCheckExitCode(1),
660658
),
661-
DisableParallel: true,
662659
}))
663660

664661
////
@@ -671,7 +668,6 @@ func Test_CreateServerErrors(t *testing.T) {
671668
core.TestCheckGolden(),
672669
core.TestCheckExitCode(1),
673670
),
674-
DisableParallel: true,
675671
}))
676672

677673
t.Run("Error: invalid total local volumes size: too low 2", core.Test(&core.TestConfig{
@@ -683,7 +679,6 @@ func Test_CreateServerErrors(t *testing.T) {
683679
core.TestCheckGolden(),
684680
core.TestCheckExitCode(1),
685681
),
686-
DisableParallel: true,
687682
}))
688683

689684
t.Run("Error: invalid total local volumes size: too low 3", core.Test(&core.TestConfig{
@@ -694,7 +689,6 @@ func Test_CreateServerErrors(t *testing.T) {
694689
core.TestCheckGolden(),
695690
core.TestCheckExitCode(1),
696691
),
697-
DisableParallel: true,
698692
}))
699693

700694
t.Run("Error: invalid total local volumes size: too high 1", core.Test(&core.TestConfig{
@@ -706,7 +700,6 @@ func Test_CreateServerErrors(t *testing.T) {
706700
core.TestCheckGolden(),
707701
core.TestCheckExitCode(1),
708702
),
709-
DisableParallel: true,
710703
}))
711704

712705
t.Run("Error: invalid total local volumes size: too high 2", core.Test(&core.TestConfig{
@@ -716,7 +709,6 @@ func Test_CreateServerErrors(t *testing.T) {
716709
core.TestCheckGolden(),
717710
core.TestCheckExitCode(1),
718711
),
719-
DisableParallel: true,
720712
}))
721713

722714
t.Run("Error: invalid total local volumes size: too high 3", core.Test(&core.TestConfig{
@@ -729,8 +721,7 @@ func Test_CreateServerErrors(t *testing.T) {
729721
core.TestCheckGolden(),
730722
core.TestCheckExitCode(1),
731723
),
732-
AfterFunc: deleteVolume("Volume"),
733-
DisableParallel: true,
724+
AfterFunc: deleteVolume("Volume"),
734725
}))
735726

736727
t.Run("Error: invalid root volume size", core.Test(&core.TestConfig{
@@ -742,7 +733,6 @@ func Test_CreateServerErrors(t *testing.T) {
742733
core.TestCheckGolden(),
743734
core.TestCheckExitCode(1),
744735
),
745-
DisableParallel: true,
746736
}))
747737

748738
t.Run("Error: disallow existing root volume ID", core.Test(&core.TestConfig{
@@ -753,8 +743,7 @@ func Test_CreateServerErrors(t *testing.T) {
753743
core.TestCheckGolden(),
754744
core.TestCheckExitCode(1),
755745
),
756-
AfterFunc: deleteVolume("Volume"),
757-
DisableParallel: true,
746+
AfterFunc: deleteVolume("Volume"),
758747
}))
759748

760749
t.Run("Error: invalid root volume ID", core.Test(&core.TestConfig{
@@ -766,7 +755,6 @@ func Test_CreateServerErrors(t *testing.T) {
766755
core.TestCheckGolden(),
767756
core.TestCheckExitCode(1),
768757
),
769-
DisableParallel: true,
770758
}))
771759

772760
t.Run("Error: already attached additional volume ID", core.Test(&core.TestConfig{
@@ -784,8 +772,7 @@ func Test_CreateServerErrors(t *testing.T) {
784772
core.TestCheckGolden(),
785773
core.TestCheckExitCode(1),
786774
),
787-
AfterFunc: deleteServer("Server"),
788-
DisableParallel: true,
775+
AfterFunc: deleteServer("Server"),
789776
}))
790777

791778
t.Run("Error: invalid root volume format", core.Test(&core.TestConfig{
@@ -795,7 +782,6 @@ func Test_CreateServerErrors(t *testing.T) {
795782
core.TestCheckGolden(),
796783
core.TestCheckExitCode(1),
797784
),
798-
DisableParallel: true,
799785
}))
800786

801787
t.Run("Error: invalid root volume snapshot ID", core.Test(&core.TestConfig{
@@ -807,7 +793,6 @@ func Test_CreateServerErrors(t *testing.T) {
807793
core.TestCheckGolden(),
808794
core.TestCheckExitCode(1),
809795
),
810-
DisableParallel: true,
811796
}))
812797

813798
t.Run("Error: invalid additional volume snapshot ID", core.Test(&core.TestConfig{
@@ -819,7 +804,6 @@ func Test_CreateServerErrors(t *testing.T) {
819804
core.TestCheckGolden(),
820805
core.TestCheckExitCode(1),
821806
),
822-
DisableParallel: true,
823807
}))
824808

825809
////
@@ -905,7 +889,6 @@ func Test_CreateServerScratchStorage(t *testing.T) {
905889
AfterFunc: core.ExecAfterCmd(
906890
"scw instance server delete {{ .CmdResult.ID }} zone=fr-par-2 with-volumes=all with-ip=true force-shutdown=true",
907891
),
908-
DisableParallel: true,
909892
}))
910893
}
911894

@@ -939,6 +922,5 @@ func Test_AttachFilesystem(t *testing.T) {
939922
"scw file filesystem delete {{ .FileSystem.ID }}",
940923
),
941924
),
942-
DisableParallel: true,
943925
}))
944926
}

‎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
@@ -42,8 +42,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
4242
testAttachVolumeServerSBSVolumeSize("0", 10),
4343
testAttachVolumeServerSBSVolumeSize("1", 10),
4444
),
45-
AfterFunc: deleteServer("Server"),
46-
DisableParallel: true,
45+
AfterFunc: deleteServer("Server"),
4746
}))
4847

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

7674
t.Run("invalid volume UUID", core.Test(&core.TestConfig{
@@ -81,8 +79,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
8179
core.TestCheckGolden(),
8280
core.TestCheckExitCode(1),
8381
),
84-
AfterFunc: deleteServer("Server"),
85-
DisableParallel: true,
82+
AfterFunc: deleteServer("Server"),
8683
}))
8784
})
8885
t.Run("Detach", func(t *testing.T) {
@@ -111,7 +108,6 @@ func Test_ServerVolumeUpdate(t *testing.T) {
111108
core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "1").ID }}`),
112109
deleteServer("Server"),
113110
),
114-
DisableParallel: true,
115111
}))
116112

117113
t.Run("invalid volume UUID", core.Test(&core.TestConfig{
@@ -122,8 +118,7 @@ func Test_ServerVolumeUpdate(t *testing.T) {
122118
core.TestCheckGolden(),
123119
core.TestCheckExitCode(1),
124120
),
125-
AfterFunc: deleteServer("Server"),
126-
DisableParallel: true,
121+
AfterFunc: deleteServer("Server"),
127122
}))
128123
})
129124
}
@@ -334,7 +329,6 @@ func Test_ServerDelete(t *testing.T) {
334329
core.TestCheckGolden(),
335330
core.TestCheckExitCode(0),
336331
),
337-
DisableParallel: true,
338332
}))
339333

340334
t.Run("only block volumes", core.Test(&core.TestConfig{
@@ -351,7 +345,6 @@ func Test_ServerDelete(t *testing.T) {
351345
AfterFunc: core.ExecAfterCmd(
352346
`scw instance volume delete {{ (index .Server.Volumes "0").ID }}`,
353347
),
354-
DisableParallel: true,
355348
}))
356349

357350
t.Run("only local volumes", core.Test(&core.TestConfig{
@@ -374,7 +367,6 @@ func Test_ServerDelete(t *testing.T) {
374367
),
375368
core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "1").ID }}`),
376369
),
377-
DisableParallel: true,
378370
}))
379371

380372
t.Run("with none volumes", core.Test(&core.TestConfig{
@@ -404,7 +396,6 @@ func Test_ServerDelete(t *testing.T) {
404396
core.ExecAfterCmd(`scw instance volume delete {{ (index .Server.Volumes "0").ID }}`),
405397
core.ExecAfterCmd(`scw block volume delete {{ (index .Server.Volumes "1").ID }}`),
406398
),
407-
DisableParallel: true,
408399
}))
409400

410401
t.Run("with sbs volumes", core.Test(&core.TestConfig{
@@ -437,7 +428,6 @@ func Test_ServerDelete(t *testing.T) {
437428
assert.Error(t, err, "%v", resp)
438429
},
439430
),
440-
DisableParallel: true,
441431
}))
442432

443433
t.Run("with multiple IPs", core.Test(&core.TestConfig{
@@ -463,7 +453,6 @@ func Test_ServerDelete(t *testing.T) {
463453
}
464454
},
465455
),
466-
DisableParallel: true,
467456
}))
468457

469458
interactive.IsInteractive = false

0 commit comments

Comments
 (0)