From 47ca8be42f47edbaa50644a717ddb2932b20ef61 Mon Sep 17 00:00:00 2001
From: Andrey Kostov <kostov.andrey@gmail.com>
Date: Fri, 24 Oct 2014 16:36:17 -0700
Subject: [PATCH] Slight additions/modifications to the test suite

---
 storagedriver/testsuites/testsuites.go | 37 ++++++++++++--------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/storagedriver/testsuites/testsuites.go b/storagedriver/testsuites/testsuites.go
index 7ca196d6e..dae5cc082 100644
--- a/storagedriver/testsuites/testsuites.go
+++ b/storagedriver/testsuites/testsuites.go
@@ -127,8 +127,9 @@ func (suite *DriverSuite) TestWriteReadStreams4(c *C) {
 
 func (suite *DriverSuite) TestContinueStreamAppend(c *C) {
 	filename := randomString(32)
+	defer suite.StorageDriver.Delete(filename)
 
-	chunkSize := uint64(32)
+	chunkSize := uint64(5 * 1024 * 1024)
 
 	contentsChunk1 := []byte(randomString(chunkSize))
 	contentsChunk2 := []byte(randomString(chunkSize))
@@ -159,14 +160,11 @@ func (suite *DriverSuite) TestContinueStreamAppend(c *C) {
 	received, err := suite.StorageDriver.GetContent(filename)
 	c.Assert(err, IsNil)
 	c.Assert(received, DeepEquals, fullContents)
-
-	offset, err = suite.StorageDriver.ResumeWritePosition(filename)
-	c.Assert(err, IsNil)
-	c.Assert(offset, Equals, uint64(3*chunkSize))
 }
 
 func (suite *DriverSuite) TestReadStreamWithOffset(c *C) {
 	filename := randomString(32)
+	defer suite.StorageDriver.Delete(filename)
 
 	chunkSize := uint64(32)
 
@@ -203,15 +201,6 @@ func (suite *DriverSuite) TestReadStreamWithOffset(c *C) {
 	c.Assert(err, IsNil)
 
 	c.Assert(readContents, DeepEquals, contentsChunk3)
-
-	reader, err = suite.StorageDriver.ReadStream(filename, chunkSize*3)
-	c.Assert(err, IsNil)
-	defer reader.Close()
-
-	readContents, err = ioutil.ReadAll(reader)
-	c.Assert(err, IsNil)
-
-	c.Assert(readContents, DeepEquals, []byte{})
 }
 
 func (suite *DriverSuite) TestReadNonexistentStream(c *C) {
@@ -222,6 +211,8 @@ func (suite *DriverSuite) TestReadNonexistentStream(c *C) {
 
 func (suite *DriverSuite) TestList(c *C) {
 	rootDirectory := randomString(uint64(8 + rand.Intn(8)))
+	defer suite.StorageDriver.Delete(rootDirectory)
+
 	parentDirectory := rootDirectory + "/" + randomString(uint64(8+rand.Intn(8)))
 	childFiles := make([]string, 50)
 	for i := 0; i < len(childFiles); i++ {
@@ -248,6 +239,9 @@ func (suite *DriverSuite) TestMove(c *C) {
 	sourcePath := randomString(32)
 	destPath := randomString(32)
 
+	defer suite.StorageDriver.Delete(sourcePath)
+	defer suite.StorageDriver.Delete(destPath)
+
 	err := suite.StorageDriver.PutContent(sourcePath, contents)
 	c.Assert(err, IsNil)
 
@@ -274,6 +268,8 @@ func (suite *DriverSuite) TestRemove(c *C) {
 	filename := randomString(32)
 	contents := []byte(randomString(32))
 
+	defer suite.StorageDriver.Delete(filename)
+
 	err := suite.StorageDriver.PutContent(filename, contents)
 	c.Assert(err, IsNil)
 
@@ -296,6 +292,9 @@ func (suite *DriverSuite) TestRemoveFolder(c *C) {
 	filename2 := randomString(32)
 	contents := []byte(randomString(32))
 
+	defer suite.StorageDriver.Delete(path.Join(dirname, filename1))
+	defer suite.StorageDriver.Delete(path.Join(dirname, filename2))
+
 	err := suite.StorageDriver.PutContent(path.Join(dirname, filename1), contents)
 	c.Assert(err, IsNil)
 
@@ -313,6 +312,8 @@ func (suite *DriverSuite) TestRemoveFolder(c *C) {
 }
 
 func (suite *DriverSuite) writeReadCompare(c *C, filename string, contents, expected []byte) {
+	defer suite.StorageDriver.Delete(filename)
+
 	err := suite.StorageDriver.PutContent(filename, contents)
 	c.Assert(err, IsNil)
 
@@ -320,12 +321,11 @@ func (suite *DriverSuite) writeReadCompare(c *C, filename string, contents, expe
 	c.Assert(err, IsNil)
 
 	c.Assert(readContents, DeepEquals, contents)
-
-	err = suite.StorageDriver.Delete(filename)
-	c.Assert(err, IsNil)
 }
 
 func (suite *DriverSuite) writeReadCompareStreams(c *C, filename string, contents, expected []byte) {
+	defer suite.StorageDriver.Delete(filename)
+
 	err := suite.StorageDriver.WriteStream(filename, 0, uint64(len(contents)), ioutil.NopCloser(bytes.NewReader(contents)))
 	c.Assert(err, IsNil)
 
@@ -337,9 +337,6 @@ func (suite *DriverSuite) writeReadCompareStreams(c *C, filename string, content
 	c.Assert(err, IsNil)
 
 	c.Assert(readContents, DeepEquals, contents)
-
-	err = suite.StorageDriver.Delete(filename)
-	c.Assert(err, IsNil)
 }
 
 var pathChars = []byte("abcdefghijklmnopqrstuvwxyz")