Skip to content

Commit a4ded85

Browse files
committed
Revert "Use t.Parallel() in most tests"
This reverts commit a9da3f0.
1 parent a9da3f0 commit a4ded85

File tree

3 files changed

+0
-29
lines changed

3 files changed

+0
-29
lines changed

global_limits_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
)
1212

1313
func TestGlobalMaxUses(t *testing.T) {
14-
t.Parallel()
15-
1614
conf := filedrop.Default
1715
conf.Limits.MaxUses = 2
1816
serv := initServ(conf)
@@ -38,8 +36,6 @@ func TestGlobalMaxUses(t *testing.T) {
3836
}
3937

4038
func TestGlobalMaxFileSize(t *testing.T) {
41-
t.Parallel()
42-
4339
conf := filedrop.Default
4440
conf.Limits.MaxFileSize = uint(len(file) - 20)
4541
serv := initServ(conf)
@@ -64,8 +60,6 @@ func TestGlobalMaxFileSize(t *testing.T) {
6460
}
6561

6662
func TestGlobalMaxStoreTime(t *testing.T) {
67-
t.Parallel()
68-
6963
conf := filedrop.Default
7064
conf.Limits.MaxStoreSecs = 3
7165
serv := initServ(conf)

perfile_limits_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import (
1010
)
1111

1212
func TestPerFileMaxUses(t *testing.T) {
13-
t.Parallel()
14-
1513
conf := filedrop.Default
1614
conf.Limits.MaxUses = 2
1715
serv := initServ(conf)
@@ -51,8 +49,6 @@ func TestPerFileMaxUses(t *testing.T) {
5149
}
5250

5351
func TestPerFileStoreTime(t *testing.T) {
54-
t.Parallel()
55-
5652
conf := filedrop.Default
5753
conf.Limits.MaxStoreSecs = 5
5854
serv := initServ(conf)
@@ -101,8 +97,6 @@ func TestPerFileStoreTime(t *testing.T) {
10197
}
10298

10399
func TestUnboundedFileLimits(t *testing.T) {
104-
t.Parallel()
105-
106100
// Setting no limits in file should allow us to set them to any value in arguments.
107101
conf := filedrop.Default
108102
serv := initServ(conf)

server_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import (
1717
)
1818

1919
func TestBasicSubmit(t *testing.T) {
20-
t.Parallel()
21-
2220
serv := initServ(filedrop.Default)
2321
ts := httptest.NewServer(serv)
2422
defer cleanServ(serv)
@@ -41,8 +39,6 @@ func TestBasicSubmit(t *testing.T) {
4139
}
4240

4341
func TestFakeFilename(t *testing.T) {
44-
t.Parallel()
45-
4642
conf := filedrop.Default
4743
serv := initServ(conf)
4844
ts := httptest.NewServer(serv)
@@ -62,8 +58,6 @@ func TestFakeFilename(t *testing.T) {
6258
}
6359

6460
func TestNonExistent(t *testing.T) {
65-
t.Parallel()
66-
6761
// Non-existent file should correctly return 404 code.
6862
serv := initServ(filedrop.Default)
6963
ts := httptest.NewServer(serv)
@@ -97,8 +91,6 @@ func TestNonExistent(t *testing.T) {
9791
}
9892

9993
func TestContentTypePreserved(t *testing.T) {
100-
t.Parallel()
101-
10294
serv := initServ(filedrop.Default)
10395
ts := httptest.NewServer(serv)
10496
defer cleanServ(serv)
@@ -134,8 +126,6 @@ func TestContentTypePreserved(t *testing.T) {
134126
}
135127

136128
func TestNoContentType(t *testing.T) {
137-
t.Parallel()
138-
139129
serv := initServ(filedrop.Default)
140130
ts := httptest.NewServer(serv)
141131
defer cleanServ(serv)
@@ -166,8 +156,6 @@ func TestNoContentType(t *testing.T) {
166156
}
167157

168158
func TestHTTPSDownstream(t *testing.T) {
169-
t.Parallel()
170-
171159
serv := initServ(filedrop.Default)
172160
ts := httptest.NewServer(serv)
173161
defer cleanServ(serv)
@@ -255,8 +243,6 @@ func testWithPrefix(t *testing.T, ts *httptest.Server, c *http.Client, prefix st
255243
}
256244

257245
func TestPrefixAgnostic(t *testing.T) {
258-
t.Parallel()
259-
260246
// Server should be able to handle requests independently
261247
// from full URL.
262248
serv := initServ(filedrop.Default)
@@ -271,9 +257,6 @@ func TestPrefixAgnostic(t *testing.T) {
271257
}
272258

273259
func TestCleanup(t *testing.T) {
274-
// FIXME: For some reason this test breaks when parallelized.
275-
//t.Parallel()
276-
277260
conf := filedrop.Default
278261
conf.CleanupIntervalSecs = 1
279262
serv := initServ(conf)

0 commit comments

Comments
 (0)