alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Merge pull request #108 from AndreyKostov/storagedriver-check-writestream-overwrite

Browse source 
Make TestContinueStreamAppend check if WriteStream can overwrite
This commit is contained in:
Olivier Gambier 2015-01-26 14:01:23 -08:00
commit f0e0a080e9
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
storagedriver/testsuites/testsuites.go
View file

@ -354,14 +354,22 @@ func (suite *DriverSuite) TestReadStreamWithOffset(c *check.C) {
c.Assert(err, check.Equals, io.EOF) c.Assert(err, check.Equals, io.EOF)
} }
// TestContinueStreamAppend tests that a stream write can be appended to without // TestContinueStreamAppendLarge tests that a stream write can be appended to without
// corrupting the data. // corrupting the data with a large chunk size.
func (suite *DriverSuite) TestContinueStreamAppend(c *check.C) { func (suite *DriverSuite) TestContinueStreamAppendLarge(c *check.C) {
suite.testContinueStreamAppend(c, int64(10*1024*1024))
}
// TestContinueStreamAppendSmall is the same as TestContinueStreamAppendLarge, but only
// with a tiny chunk size in order to test corner cases for some cloud storage drivers.
func (suite *DriverSuite) TestContinueStreamAppendSmall(c *check.C) {
suite.testContinueStreamAppend(c, int64(32))
}
func (suite *DriverSuite) testContinueStreamAppend(c *check.C, chunkSize int64) {
filename := randomPath(32) filename := randomPath(32)
defer suite.StorageDriver.Delete(firstPart(filename)) defer suite.StorageDriver.Delete(firstPart(filename))
chunkSize := int64(5 * 1024 * 1024)
contentsChunk1 := randomContents(chunkSize) contentsChunk1 := randomContents(chunkSize)
contentsChunk2 := randomContents(chunkSize) contentsChunk2 := randomContents(chunkSize)
contentsChunk3 := randomContents(chunkSize) contentsChunk3 := randomContents(chunkSize)
@ -379,9 +387,6 @@ func (suite *DriverSuite) TestContinueStreamAppend(c *check.C) {
c.Assert(fi, check.NotNil) c.Assert(fi, check.NotNil)
c.Assert(fi.Size(), check.Equals, int64(len(contentsChunk1))) c.Assert(fi.Size(), check.Equals, int64(len(contentsChunk1)))
if fi.Size() > chunkSize {
c.Errorf("Offset too large, %d > %d", fi.Size(), chunkSize)
}
nn, err = suite.StorageDriver.WriteStream(filename, fi.Size(), bytes.NewReader(contentsChunk2)) nn, err = suite.StorageDriver.WriteStream(filename, fi.Size(), bytes.NewReader(contentsChunk2))
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(nn, check.Equals, int64(len(contentsChunk2))) c.Assert(nn, check.Equals, int64(len(contentsChunk2)))
@ -391,9 +396,15 @@ func (suite *DriverSuite) TestContinueStreamAppend(c *check.C) {
c.Assert(fi, check.NotNil) c.Assert(fi, check.NotNil)
c.Assert(fi.Size(), check.Equals, 2*chunkSize) c.Assert(fi.Size(), check.Equals, 2*chunkSize)
if fi.Size() > 2*chunkSize { // Test re-writing the last chunk
c.Errorf("Offset too large, %d > %d", fi.Size(), 2*chunkSize) nn, err = suite.StorageDriver.WriteStream(filename, fi.Size()-chunkSize, bytes.NewReader(contentsChunk2))
} c.Assert(err, check.IsNil)
c.Assert(nn, check.Equals, int64(len(contentsChunk2)))
fi, err = suite.StorageDriver.Stat(filename)
c.Assert(err, check.IsNil)
c.Assert(fi, check.NotNil)
c.Assert(fi.Size(), check.Equals, 2*chunkSize)
nn, err = suite.StorageDriver.WriteStream(filename, fi.Size(), bytes.NewReader(fullContents[fi.Size():])) nn, err = suite.StorageDriver.WriteStream(filename, fi.Size(), bytes.NewReader(fullContents[fi.Size():]))
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)