From b3b0ba775c7e11a1c4454f5d8cf6fbf62c8591b4 Mon Sep 17 00:00:00 2001
From: zhangbiao <zhangbiao@channelsoft.com>
Date: Mon, 17 Jun 2019 18:09:56 +0800
Subject: [PATCH] update gfpool test:error

---
 g/os/gfpool/gfpool_z_unit_test.go | 61 +++++++++++++++++++------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/g/os/gfpool/gfpool_z_unit_test.go b/g/os/gfpool/gfpool_z_unit_test.go
index e916175f3..0cc827de1 100644
--- a/g/os/gfpool/gfpool_z_unit_test.go
+++ b/g/os/gfpool/gfpool_z_unit_test.go
@@ -15,15 +15,19 @@ func TestOpen(t *testing.T) {
 	testFile := start("TestOpen.txt")
 
 	gtest.Case(t, func() {
-		f, _ := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		f, err := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		gtest.AssertEQ(gfile.GetContents(f.Name()), "123")
+		gtest.AssertEQ(err, nil)
 		f.Close()
 
-		f2, _ := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		f2, err1 := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		gtest.AssertEQ(err1, nil)
 		gtest.AssertEQ(f, f2)
 		f2.Close()
 
 		// Deprecated test
-		f3, _ := gfpool.OpenFile(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		f3, err2 := gfpool.OpenFile(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		gtest.AssertEQ(err2, nil)
 		gtest.AssertEQ(f, f3)
 		f3.Close()
 
@@ -41,35 +45,39 @@ func TestOpenErr(t *testing.T) {
 
 		// delete file error
 		testFile := start("TestOpenDeleteErr.txt")
-		f, _ := gfpool.Open(testFile, os.O_RDWR, 0666)
-		f.Close()
+		pool := gfpool.New(testFile, os.O_RDWR, 0666)
+		_, err1 := pool.File()
+		gtest.AssertEQ(err1, nil)
 		stop(testFile)
-		_, err = gfpool.Open(testFile, os.O_RDWR, 0666)
-		gtest.AssertNE(err, nil)
+		_, err1 = pool.File()
+		gtest.AssertNE(err1, nil)
 
 		// append mode delete file error
 		testFile = start("TestOpenCreateErr.txt")
-		f, _ = gfpool.Open(testFile, os.O_CREATE, 0666)
-		f.Close()
+		pool = gfpool.New(testFile, os.O_CREATE, 0666)
+		_, err1 = pool.File()
+		gtest.AssertEQ(err1, nil)
 		stop(testFile)
-		_, err = gfpool.Open(testFile, os.O_CREATE, 0666)
-		gtest.AssertNE(err, nil)
+		_, err1 = pool.File()
+		gtest.AssertNE(err1, nil)
 
 		// append mode delete file error
 		testFile = start("TestOpenAppendErr.txt")
-		f, _ = gfpool.Open(testFile, os.O_APPEND, 0666)
-		f.Close()
+		pool = gfpool.New(testFile, os.O_APPEND, 0666)
+		_, err1 = pool.File()
+		gtest.AssertEQ(err1, nil)
 		stop(testFile)
-		_, err = gfpool.Open(testFile, os.O_APPEND, 0666)
-		gtest.AssertNE(err, nil)
+		_, err1 = pool.File()
+		gtest.AssertNE(err1, nil)
 
 		// trunc mode delete file error
 		testFile = start("TestOpenTruncErr.txt")
-		f, _ = gfpool.Open(testFile, os.O_TRUNC, 0666)
-		f.Close()
+		pool = gfpool.New(testFile, os.O_TRUNC, 0666)
+		_, err1 = pool.File()
+		gtest.AssertEQ(err1, nil)
 		stop(testFile)
-		_, err = gfpool.Open(testFile, os.O_TRUNC, 0666)
-		gtest.AssertNE(err, nil)
+		_, err1 = pool.File()
+		gtest.AssertNE(err1, nil)
 	})
 }
 
@@ -78,16 +86,19 @@ func TestOpenExpire(t *testing.T) {
 	testFile := start("TestOpenExpire.txt")
 
 	gtest.Case(t, func() {
-		f, _ := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666, 100)
+		f, err := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666, 100)
+		gtest.AssertEQ(err, nil)
 		f.Close()
 
 		time.Sleep(150 * time.Millisecond)
-		f2, _ := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666, 100)
+		f2, err1 := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666, 100)
+		gtest.AssertEQ(err1, nil)
 		gtest.AssertNE(f, f2)
 		f2.Close()
 
 		// Deprecated test
-		f3, _ := gfpool.OpenFile(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666, 100)
+		f3, err2 := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666, 100)
+		gtest.AssertEQ(err2, nil)
 		gtest.AssertEQ(f2, f3)
 		f3.Close()
 	})
@@ -100,12 +111,14 @@ func TestNewPool(t *testing.T) {
 	testFile := start("TestNewPool.txt")
 
 	gtest.Case(t, func() {
-		f, _ := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		f, err := gfpool.Open(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
+		gtest.AssertEQ(err, nil)
 		f.Close()
 
 		pool := gfpool.New(testFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND, 0666)
-		f2, _ := pool.File()
+		f2, err1 := pool.File()
 		// pool not equal
+		gtest.AssertEQ(err1, nil)
 		gtest.AssertNE(f, f2)
 		f2.Close()