From b938e40fb5bce4dace4091765c10f611ecc1bbc7 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@harshavardhana.net>
Date: Sun, 20 Sep 2015 13:50:07 -0700
Subject: [PATCH] Move atomic package to the top and simplify its tests

---
 controller_rpc_test.go                |  6 +++++-
 pkg/{utils => }/atomic/atomic.go      |  0
 pkg/{utils => }/atomic/atomic_test.go | 26 +++++++++++++++++---------
 pkg/donut/common.go                   |  2 +-
 pkg/donut/disk/disk.go                |  2 +-
 5 files changed, 24 insertions(+), 12 deletions(-)
 rename pkg/{utils => }/atomic/atomic.go (100%)
 rename pkg/{utils => }/atomic/atomic_test.go (73%)

diff --git a/controller_rpc_test.go b/controller_rpc_test.go
index 2b4f7bbba..233ac0325 100644
--- a/controller_rpc_test.go
+++ b/controller_rpc_test.go
@@ -27,7 +27,9 @@ import (
 	. "gopkg.in/check.v1"
 )
 
-type ControllerRPCSuite struct{}
+type ControllerRPCSuite struct {
+	root string
+}
 
 var _ = Suite(&ControllerRPCSuite{})
 
@@ -39,6 +41,7 @@ var (
 func (s *ControllerRPCSuite) SetUpSuite(c *C) {
 	root, err := ioutil.TempDir(os.TempDir(), "api-")
 	c.Assert(err, IsNil)
+	s.root = root
 	auth.SetAuthConfigPath(root)
 
 	testControllerRPC = httptest.NewServer(getControllerRPCHandler())
@@ -48,6 +51,7 @@ func (s *ControllerRPCSuite) SetUpSuite(c *C) {
 }
 
 func (s *ControllerRPCSuite) TearDownSuite(c *C) {
+	os.RemoveAll(s.root)
 	testServerRPC.Close()
 	testControllerRPC.Close()
 }
diff --git a/pkg/utils/atomic/atomic.go b/pkg/atomic/atomic.go
similarity index 100%
rename from pkg/utils/atomic/atomic.go
rename to pkg/atomic/atomic.go
diff --git a/pkg/utils/atomic/atomic_test.go b/pkg/atomic/atomic_test.go
similarity index 73%
rename from pkg/utils/atomic/atomic_test.go
rename to pkg/atomic/atomic_test.go
index 69f045fed..1f026e2a4 100644
--- a/pkg/utils/atomic/atomic_test.go
+++ b/pkg/atomic/atomic_test.go
@@ -27,29 +27,37 @@ import (
 
 func Test(t *testing.T) { TestingT(t) }
 
-type MySuite struct{}
+type MySuite struct {
+	root string
+}
 
 var _ = Suite(&MySuite{})
 
-func (s *MySuite) TestAtomic(c *C) {
+func (s *MySuite) SetUpSuite(c *C) {
 	root, err := ioutil.TempDir("/tmp", "atomic-")
 	c.Assert(err, IsNil)
-	f, err := FileCreate(filepath.Join(root, "testfile"))
+	s.root = root
+}
+
+func (s *MySuite) TearDownSuite(c *C) {
+	os.RemoveAll(s.root)
+}
+
+func (s *MySuite) TestAtomic(c *C) {
+	f, err := FileCreate(filepath.Join(s.root, "testfile"))
 	c.Assert(err, IsNil)
-	_, err = os.Stat(filepath.Join(root, "testfile"))
+	_, err = os.Stat(filepath.Join(s.root, "testfile"))
 	c.Assert(err, Not(IsNil))
 	err = f.Close()
 	c.Assert(err, IsNil)
-	_, err = os.Stat(filepath.Join(root, "testfile"))
+	_, err = os.Stat(filepath.Join(s.root, "testfile"))
 	c.Assert(err, IsNil)
 }
 
 func (s *MySuite) TestAtomicPurge(c *C) {
-	root, err := ioutil.TempDir("/tmp", "atomic-")
-	c.Assert(err, IsNil)
-	f, err := FileCreate(filepath.Join(root, "testfile"))
+	f, err := FileCreate(filepath.Join(s.root, "purgefile"))
 	c.Assert(err, IsNil)
-	_, err = os.Stat(filepath.Join(root, "testfile"))
+	_, err = os.Stat(filepath.Join(s.root, "purgefile"))
 	c.Assert(err, Not(IsNil))
 	err = f.CloseAndPurge()
 	c.Assert(err, IsNil)
diff --git a/pkg/donut/common.go b/pkg/donut/common.go
index 0736ad437..390eb93fd 100644
--- a/pkg/donut/common.go
+++ b/pkg/donut/common.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/minio/minio/pkg/utils/atomic"
+	"github.com/minio/minio/pkg/atomic"
 )
 
 // IsValidDonut - verify donut name is correct
diff --git a/pkg/donut/disk/disk.go b/pkg/donut/disk/disk.go
index e7689a7ed..6b34e5db5 100644
--- a/pkg/donut/disk/disk.go
+++ b/pkg/donut/disk/disk.go
@@ -25,8 +25,8 @@ import (
 	"sync"
 	"syscall"
 
+	"github.com/minio/minio/pkg/atomic"
 	"github.com/minio/minio/pkg/probe"
-	"github.com/minio/minio/pkg/utils/atomic"
 )
 
 // Disk container for disk parameters