Skip to content

Commit 01cbdfb

Browse files
CDRaynCDRayn
committed
Add additional checks in tests
1 parent 689d83a commit 01cbdfb

File tree

6 files changed

+21
-1
lines changed

6 files changed

+21
-1
lines changed

‎pkg/rsstorage/internal/integration_test/chunks_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ func (s *ChunksPartialReadSuite) TestReadPartialTimeout(c *check.C) {
393393
for {
394394
_, err := io.CopyN(pW, b, int64(cw.ChunkSize))
395395
if err == io.EOF {
396-
err = nil
397396
return
398397
}
399398
c.Assert(err, check.IsNil)

‎pkg/rsstorage/servers/file/server_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,9 @@ func (s *FileStorageServerSuite) TestUsage(c *check.C) {
645645
_, readErr = rand.Read(fileContents5)
646646
c.Assert(readErr, check.IsNil)
647647
dir1, err := os.MkdirTemp(tempdir, "dutest")
648+
c.Assert(err, check.IsNil)
648649
dir2, err := os.MkdirTemp(dir1, "another")
650+
c.Assert(err, check.IsNil)
649651
defer os.RemoveAll(dir1)
650652
c.Assert(err, check.IsNil)
651653
err = os.WriteFile(filepath.Join(tempdir, "test1"), fileContents1, 0644)
@@ -691,7 +693,9 @@ func (s *FileStorageServerSuite) TestUsageTimeout(c *check.C) {
691693
_, readErr = rand.Read(fileContents5)
692694
c.Assert(readErr, check.IsNil)
693695
dir1, err := os.MkdirTemp(tempdir, "dutest")
696+
c.Assert(err, check.IsNil)
694697
dir2, err := os.MkdirTemp(dir1, "another")
698+
c.Assert(err, check.IsNil)
695699
defer os.RemoveAll(dir1)
696700
c.Assert(err, check.IsNil)
697701
err = os.WriteFile(filepath.Join(tempdir, "test1"), fileContents1, 0644)
@@ -1183,6 +1187,7 @@ func (s *FileCopyMoveSuite) TestMoveReal(c *check.C) {
11831187

11841188
// Read one chunk
11851189
f, _, _, _, _, err := serverDest.Get(ctx, "dir", "CHUNK")
1190+
c.Assert(err, check.IsNil)
11861191
b, err := io.ReadAll(f)
11871192
c.Assert(err, check.IsNil)
11881193
c.Assert(string(b), check.Equals, servertest.TestDESC)

‎pkg/rsstorage/servers/postgres/server_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,12 +632,14 @@ func (s *PgCacheServerSuite) TestMove(c *check.C) {
632632
// Make sure we cannot get old item
633633
r, _, sz, _, ok, err := sourceServer.Get(ctx, "ad2", "cacheaddress4")
634634
c.Check(err, check.IsNil)
635+
c.Check(sz, check.Equals, int64(0))
635636
c.Check(ok, check.Equals, false)
636637
c.Check(r, check.IsNil)
637638

638639
// Make sure we cannot get old item
639640
r, _, sz, _, ok, err = sourceServer.Get(ctx, "dir", "CHUNKED")
640641
c.Check(err, check.IsNil)
642+
c.Check(sz, check.Equals, int64(0))
641643
c.Check(ok, check.Equals, false)
642644
c.Check(r, check.IsNil)
643645

‎pkg/rsstorage/servers/s3server/s3_enumeration_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func (s *MetaTestSuite) TestBucketDirs(c *check.C) {
5050
dirs, err := awsOps.BucketDirs(ctx, "no-sync", "bin/")
5151
c.Assert(err, check.NotNil)
5252
c.Assert(strings.Contains(err.Error(), "StatusCode: 404"), check.Equals, true)
53+
c.Assert(dirs, check.IsNil)
5354

5455
dirs, err = awsOps.BucketDirs(ctx, "sync", "bin/")
5556
c.Assert(err, check.IsNil)
@@ -95,6 +96,7 @@ func (s *MetaTestSuite) TestBucketObjects(c *check.C) {
9596
files, err := awsOps.BucketObjects(ctx, "no-sync", "bin/3.5-xenial", 1, false, BinaryReg)
9697
c.Assert(err, check.NotNil)
9798
c.Assert(strings.Contains(err.Error(), "StatusCode: 404"), check.Equals, true)
99+
c.Check(files, check.IsNil)
98100

99101
files, err = awsOps.BucketObjects(ctx, "sync", "bin/3.5-xenial", 1, false, BinaryReg)
100102
c.Assert(err, check.IsNil)

‎pkg/rsstorage/servers/s3server/s3_service_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ func (s *S3WrapperSuite) TestListObjects(c *check.C) {
230230
files, err := wrapper.ListObjects(ctx, &s3.ListObjectsV2Input{Bucket: &bucket, Prefix: &prefix})
231231
c.Assert(err, check.NotNil)
232232
c.Assert(strings.Contains(err.Error(), "StatusCode: 404"), check.Equals, true)
233+
c.Assert(files, check.IsNil)
233234

234235
bucket = "sync"
235236
files, err = wrapper.ListObjects(ctx, &s3.ListObjectsV2Input{Bucket: &bucket, Prefix: &prefix})

‎pkg/rsstorage/servers/s3server/server_test.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
232232
svc.headErr = errors.New("head error")
233233
ok, chunked, sz, mod, err = server.Check(ctx, "dir", "address")
234234
c.Assert(err, check.ErrorMatches, "head error")
235+
c.Assert(mod, check.Equals, time.Time{})
235236
c.Assert(chunked, check.IsNil)
236237
c.Assert(sz, check.DeepEquals, int64(0))
237238
c.Assert(ok, check.Equals, false)
@@ -240,6 +241,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
240241
svc.headErr = &types.NoSuchKey{}
241242
ok, chunked, sz, mod, err = server.Check(ctx, "dir", "address")
242243
c.Assert(err, check.IsNil)
244+
c.Assert(mod, check.Equals, time.Time{})
243245
c.Assert(chunked, check.IsNil)
244246
c.Assert(sz, check.DeepEquals, int64(0))
245247
c.Assert(ok, check.Equals, false)
@@ -254,6 +256,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
254256
}
255257
ok, chunked, sz, mod, err = server.Check(ctx, "dir", "address")
256258
c.Assert(err, check.ErrorMatches, "info.json head error")
259+
c.Assert(mod, check.Equals, time.Time{})
257260
c.Assert(chunked, check.IsNil)
258261
c.Assert(sz, check.DeepEquals, int64(0))
259262
c.Assert(ok, check.Equals, false)
@@ -272,6 +275,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
272275
}
273276
ok, chunked, sz, mod, err = server.Check(ctx, "dir", "address")
274277
c.Assert(err, check.ErrorMatches, "info.json get error")
278+
c.Assert(mod, check.Equals, time.Time{})
275279
c.Assert(chunked, check.IsNil)
276280
c.Assert(sz, check.DeepEquals, int64(0))
277281
c.Assert(ok, check.Equals, false)
@@ -287,12 +291,14 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
287291
}
288292
ok, chunked, sz, mod, err = server.Check(ctx, "dir", "address")
289293
c.Assert(err, check.ErrorMatches, "invalid character 'b' looking for beginning of value")
294+
c.Assert(mod, check.Equals, time.Time{})
290295
c.Assert(chunked, check.IsNil)
291296
c.Assert(sz, check.DeepEquals, int64(0))
292297
c.Assert(ok, check.Equals, false)
293298

294299
// Chunked - ok
295300
nowbytes, err := now.MarshalJSON()
301+
c.Assert(err, check.IsNil)
296302
info := []byte(fmt.Sprintf(`{"chunk_size":64,"file_size":3232,"num_chunks":15,"complete":true,"mod_time":%s}`, string(nowbytes)))
297303
output = &testReadCloser{bytes.NewBuffer(info)}
298304
svc.getMap = map[string]GetResponse{
@@ -304,6 +310,7 @@ func (s *S3StorageServerSuite) TestCheck(c *check.C) {
304310
}
305311
ok, chunked, sz, mod, err = server.Check(ctx, "dir", "address")
306312
c.Assert(err, check.IsNil)
313+
c.Assert(mod, check.Equals, time.Time{})
307314
c.Assert(chunked, check.NotNil)
308315
c.Assert(sz, check.DeepEquals, int64(3232))
309316
c.Assert(ok, check.Equals, true)
@@ -339,6 +346,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
339346
svc.getErr = errors.New("get error")
340347
rs, _, sz, mod, ok, err = server.Get(ctx, "dir", "address")
341348
c.Assert(err, check.ErrorMatches, "get error")
349+
c.Assert(mod, check.Equals, time.Time{})
342350
c.Assert(rs, check.IsNil)
343351
c.Assert(sz, check.DeepEquals, int64(0))
344352
c.Assert(ok, check.Equals, false)
@@ -348,6 +356,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
348356
svc.headErr = &types.NoSuchKey{}
349357
rs, _, sz, mod, ok, err = server.Get(ctx, "dir", "address")
350358
c.Assert(err, check.IsNil)
359+
c.Assert(mod, check.Equals, time.Time{})
351360
c.Assert(rs, check.IsNil)
352361
c.Assert(sz, check.DeepEquals, int64(0))
353362
c.Assert(ok, check.Equals, false)
@@ -362,6 +371,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
362371
}
363372
rs, _, sz, mod, ok, err = server.Get(ctx, "dir", "address")
364373
c.Assert(err, check.ErrorMatches, "info.json head error")
374+
c.Assert(mod, check.Equals, time.Time{})
365375
c.Assert(rs, check.IsNil)
366376
c.Assert(sz, check.DeepEquals, int64(0))
367377
c.Assert(ok, check.Equals, false)
@@ -385,6 +395,7 @@ func (s *S3StorageServerSuite) TestGet(c *check.C) {
385395
rs, _, sz, mod, ok, err = server.Get(ctx, "dir", "address")
386396
c.Assert(err, check.ErrorMatches, "error reading chunked directory files for address: chunk read error")
387397
c.Assert(rs, check.IsNil)
398+
c.Assert(mod, check.Equals, time.Time{})
388399
c.Assert(sz, check.Equals, int64(0))
389400
c.Assert(ok, check.Equals, false)
390401

0 commit comments

Comments
 (0)