Fix for tests leaving out temp directories (#2025)

object-api_test.go

@@ -17,58 +17,53 @@
 package main
 
 import (
-	"io/ioutil"
-	"os"
-
 	. "gopkg.in/check.v1"
 )
 
-type MySuite struct{}
+type ObjectLayerAPISuite struct{}
-
-var _ = Suite(&MySuite{})
 
-func (s *MySuite) TestFSAPISuite(c *C) {
+var _ = Suite(&ObjectLayerAPISuite{})
-	var storageList []string
 
+// TestFSAPISuite - Calls object layer suite tests with FS backend.
+func (s *ObjectLayerAPISuite) TestFSAPISuite(c *C) {
 	// Initialize name space lock.
 	initNSLock()
-
+	// function which creates a temp FS backend and executes the object layer suite test.
-	create := func() ObjectLayer {
+	execObjectLayerSuiteTestFS := func(objSuiteTest objSuiteTestType) {
-		path, err := ioutil.TempDir(os.TempDir(), "minio-")
+		// create temp object layer backend.
-		c.Check(err, IsNil)
+		// returns the disk and FS object layer.
-		objAPI, err := newFSObjects(path)
+		objLayer, fsDisk, err := makeTestBackend("FS")
 		c.Check(err, IsNil)
-		storageList = append(storageList, path)
+		// remove the disks.
-		return objAPI
+		defer removeRoots(fsDisk)
+		// execute the object layer suite tests.
+		objSuiteTest(c, objLayer)
 	}
-	APITestSuite(c, create)
+	// APITestSuite contains set of all object layer suite test.
-	defer removeRootsC(c, storageList)
+	// These set of test functions are called here.
+	APITestSuite(c, execObjectLayerSuiteTestFS)
 }
 
-func (s *MySuite) TestXLAPISuite(c *C) {
+// type for object layer suites tests.
-	var storageList []string
+type objSuiteTestType func(c *C, obj ObjectLayer)
 
+// TestXLAPISuite - Calls object layer suite tests with XL backend.
+func (s *ObjectLayerAPISuite) TestXLAPISuite(c *C) {
 	// Initialize name space lock.
 	initNSLock()
-
+	// function which creates a temp XL backend and executes the object layer suite test.
-	create := func() ObjectLayer {
+	execObjectLayerSuiteTestXL := func(objSuiteTest objSuiteTestType) {
-		var nDisks = 16 // Maximum disks.
+		// create temp object layer backend.
-		var erasureDisks []string
+		// returns the disk and XL object layer.
-		for i := 0; i < nDisks; i++ {
+		objLayer, erasureDisks, err := makeTestBackend("XL")
-			path, err := ioutil.TempDir(os.TempDir(), "minio-")
-			c.Check(err, IsNil)
-			erasureDisks = append(erasureDisks, path)
-		}
-		objAPI, err := newXLObjects(erasureDisks)
 		c.Check(err, IsNil)
-		return objAPI
+		// remove the disks.
+		defer removeRoots(erasureDisks)
+		// execute the object layer suite tests.
+		objSuiteTest(c, objLayer)
 	}
-	APITestSuite(c, create)
+	// APITestSuite contains set of all object layer suite test.
-	defer removeRootsC(c, storageList)
+	// These set of test functions are called here.
-}
+	APITestSuite(c, execObjectLayerSuiteTestXL)
 
-func removeRootsC(c *C, roots []string) {
-	for _, root := range roots {
-		removeAll(root)
-	}
 }

object_api_suite_test.go

@@ -69,36 +69,39 @@ func (r *testOneByteReadNoEOF) Read(p []byte) (n int, err error) {
 }
 
 // APITestSuite - collection of API tests.
-func APITestSuite(c *check.C, create func() ObjectLayer) {
+func APITestSuite(c *check.C, execObjLayerSuiteTest func(objSuiteTest objSuiteTestType)) {
-	testMakeBucket(c, create)
+	// List containing collection of all tests.
-	testMultipleObjectCreation(c, create)
+	testFuncList := []func(c *check.C, obj ObjectLayer){
-	testPaging(c, create)
+		testMakeBucket,
-	testObjectOverwriteWorks(c, create)
+		testMultipartObjectCreation,
-	testNonExistantBucketOperations(c, create)
+		testPaging,
-	testBucketRecreateFails(c, create)
+		testObjectOverwriteWorks,
-	testPutObject(c, create)
+		testNonExistantBucketOperations,
-	testPutObjectInSubdir(c, create)
+		testBucketRecreateFails,
-	testListBuckets(c, create)
+		testPutObject,
-	testListBucketsOrder(c, create)
+		testPutObjectInSubdir,
-	testListObjectsTestsForNonExistantBucket(c, create)
+		testListBuckets,
-	testNonExistantObjectInBucket(c, create)
+		testListBucketsOrder,
-	testGetDirectoryReturnsObjectNotFound(c, create)
+		testListObjectsTestsForNonExistantBucket,
-	testContentType(c, create)
+		testNonExistantObjectInBucket,
-	testMultipartObjectCreation(c, create)
+		testGetDirectoryReturnsObjectNotFound,
-	testMultipartObjectAbort(c, create)
+		testContentType,
+		testMultipartObjectAbort,
+	}
+	// iterate over list of tests and execute them.
+	for _, testFunc := range testFuncList {
+		execObjLayerSuiteTest(testFunc)
+	}
 }
 
 // Tests validate bucket creation.
-func testMakeBucket(c *check.C, create func() ObjectLayer) {
+func testMakeBucket(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket-unknown")
 	c.Assert(err, check.IsNil)
-
 }
 
 // Tests validate creation of part files during Multipart operation.
-func testMultipartObjectCreation(c *check.C, create func() ObjectLayer) {
+func testMultipartObjectCreation(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)
 	uploadID, err := obj.NewMultipartUpload("bucket", "key", nil)
@@ -123,8 +126,7 @@ func testMultipartObjectCreation(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate abortion of Multipart operation.
-func testMultipartObjectAbort(c *check.C, create func() ObjectLayer) {
+func testMultipartObjectAbort(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)
 	uploadID, err := obj.NewMultipartUpload("bucket", "key", nil)
@@ -155,9 +157,8 @@ func testMultipartObjectAbort(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate object creation.
-func testMultipleObjectCreation(c *check.C, create func() ObjectLayer) {
+func testMultipleObjectCreation(c *check.C, obj ObjectLayer) {
 	objects := make(map[string][]byte)
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)
 	for i := 0; i < 10; i++ {
@@ -194,8 +195,7 @@ func testMultipleObjectCreation(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate creation of objects and the order of listing using various filters for ListObjects operation.
-func testPaging(c *check.C, create func() ObjectLayer) {
+func testPaging(c *check.C, obj ObjectLayer) {
-	obj := create()
 	obj.MakeBucket("bucket")
 	result, err := obj.ListObjects("bucket", "", "", "", 0)
 	c.Assert(err, check.IsNil)
@@ -298,8 +298,7 @@ func testPaging(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate overwriting of an existing object.
-func testObjectOverwriteWorks(c *check.C, create func() ObjectLayer) {
+func testObjectOverwriteWorks(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)
 
@@ -317,16 +316,14 @@ func testObjectOverwriteWorks(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate that bucket operation on non-existent bucket fails.
-func testNonExistantBucketOperations(c *check.C, create func() ObjectLayer) {
+func testNonExistantBucketOperations(c *check.C, obj ObjectLayer) {
-	obj := create()
 	_, err := obj.PutObject("bucket1", "object", int64(len("one")), bytes.NewBufferString("one"), nil)
 	c.Assert(err, check.Not(check.IsNil))
 	c.Assert(err.Error(), check.Equals, "Bucket not found: bucket1")
 }
 
 // Tests validate that recreation of the bucket fails.
-func testBucketRecreateFails(c *check.C, create func() ObjectLayer) {
+func testBucketRecreateFails(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("string")
 	c.Assert(err, check.IsNil)
 	err = obj.MakeBucket("string")
@@ -335,8 +332,7 @@ func testBucketRecreateFails(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate PutObject without prefix.
-func testPutObject(c *check.C, create func() ObjectLayer) {
+func testPutObject(c *check.C, obj ObjectLayer) {
-	obj := create()
 	content := []byte("testcontent")
 	length := int64(len(content))
 	readerEOF := newTestReaderEOF(content)
@@ -360,8 +356,7 @@ func testPutObject(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate PutObject with subdirectory prefix.
-func testPutObjectInSubdir(c *check.C, create func() ObjectLayer) {
+func testPutObjectInSubdir(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)
 
@@ -376,9 +371,7 @@ func testPutObjectInSubdir(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate ListBuckets.
-func testListBuckets(c *check.C, create func() ObjectLayer) {
+func testListBuckets(c *check.C, obj ObjectLayer) {
-	obj := create()
-
 	// test empty list.
 	buckets, err := obj.ListBuckets()
 	c.Assert(err, check.IsNil)
@@ -409,27 +402,23 @@ func testListBuckets(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate the order of result of ListBuckets.
-func testListBucketsOrder(c *check.C, create func() ObjectLayer) {
+func testListBucketsOrder(c *check.C, obj ObjectLayer) {
 	// if implementation contains a map, order of map keys will vary.
 	// this ensures they return in the same order each time.
-	for i := 0; i < 10; i++ {
+	// add one and test exists.
-		obj := create()
+	err := obj.MakeBucket("bucket1")
-		// add one and test exists.
+	c.Assert(err, check.IsNil)
-		err := obj.MakeBucket("bucket1")
+	err = obj.MakeBucket("bucket2")
-		c.Assert(err, check.IsNil)
+	c.Assert(err, check.IsNil)
-		err = obj.MakeBucket("bucket2")
+	buckets, err := obj.ListBuckets()
-		c.Assert(err, check.IsNil)
+	c.Assert(err, check.IsNil)
-		buckets, err := obj.ListBuckets()
+	c.Assert(len(buckets), check.Equals, 2)
-		c.Assert(err, check.IsNil)
+	c.Assert(buckets[0].Name, check.Equals, "bucket1")
-		c.Assert(len(buckets), check.Equals, 2)
+	c.Assert(buckets[1].Name, check.Equals, "bucket2")
-		c.Assert(buckets[0].Name, check.Equals, "bucket1")
-		c.Assert(buckets[1].Name, check.Equals, "bucket2")
-	}
 }
 
 // Tests validate that ListObjects operation on a non-existent bucket fails as expected.
-func testListObjectsTestsForNonExistantBucket(c *check.C, create func() ObjectLayer) {
+func testListObjectsTestsForNonExistantBucket(c *check.C, obj ObjectLayer) {
-	obj := create()
 	result, err := obj.ListObjects("bucket", "", "", "", 1000)
 	c.Assert(err, check.Not(check.IsNil))
 	c.Assert(result.IsTruncated, check.Equals, false)
@@ -438,8 +427,7 @@ func testListObjectsTestsForNonExistantBucket(c *check.C, create func() ObjectLa
 }
 
 // Tests validate that GetObject fails on a non-existent bucket as expected.
-func testNonExistantObjectInBucket(c *check.C, create func() ObjectLayer) {
+func testNonExistantObjectInBucket(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)
 
@@ -454,8 +442,7 @@ func testNonExistantObjectInBucket(c *check.C, create func() ObjectLayer) {
 }
 
 // Tests validate that GetObject on an existing directory fails as expected.
-func testGetDirectoryReturnsObjectNotFound(c *check.C, create func() ObjectLayer) {
+func testGetDirectoryReturnsObjectNotFound(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)
 
@@ -484,8 +471,7 @@ func testGetDirectoryReturnsObjectNotFound(c *check.C, create func() ObjectLayer
 }
 
 // Test content-type
-func testContentType(c *check.C, create func() ObjectLayer) {
+func testContentType(c *check.C, obj ObjectLayer) {
-	obj := create()
 	err := obj.MakeBucket("bucket")
 	c.Assert(err, check.IsNil)