From 9f46b4621bcebe25d7b33c3b320d99559a35445f Mon Sep 17 00:00:00 2001
From: John Mulligan <jmulligan@redhat.com>
Date: Thu, 12 Dec 2019 15:00:51 -0500
Subject: [PATCH] cephfs: include cephfs_test.go in cephfs package

This will allow us to test private functions from the cephfs package
int our test file.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---
 cephfs/cephfs_test.go | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/cephfs/cephfs_test.go b/cephfs/cephfs_test.go
index f62d642..28c84a1 100644
--- a/cephfs/cephfs_test.go
+++ b/cephfs/cephfs_test.go
@@ -1,4 +1,4 @@
-package cephfs_test
+package cephfs
 
 import (
 	"fmt"
@@ -6,7 +6,6 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/ceph/go-ceph/cephfs"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -16,13 +15,13 @@ var (
 )
 
 func TestCreateMount(t *testing.T) {
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	assert.NotNil(t, mount)
 }
 
 func TestMountRoot(t *testing.T) {
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)
 
@@ -34,7 +33,7 @@ func TestMountRoot(t *testing.T) {
 }
 
 func TestSyncFs(t *testing.T) {
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)
 
@@ -49,7 +48,7 @@ func TestSyncFs(t *testing.T) {
 }
 
 func TestChangeDir(t *testing.T) {
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)
 
@@ -78,7 +77,7 @@ func TestChangeDir(t *testing.T) {
 
 func TestRemoveDir(t *testing.T) {
 	dirname := "one"
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)
 
@@ -107,7 +106,7 @@ func TestRemoveDir(t *testing.T) {
 }
 
 func TestUnmountMount(t *testing.T) {
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)
 	fmt.Printf("%#v\n", mount.IsMounted())
@@ -125,7 +124,7 @@ func TestUnmountMount(t *testing.T) {
 }
 
 func TestReleaseMount(t *testing.T) {
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)
 
@@ -137,7 +136,7 @@ func TestChmodDir(t *testing.T) {
 	dirname := "two"
 	var stats_before uint32 = 0755
 	var stats_after uint32 = 0700
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)
 
@@ -173,7 +172,7 @@ func TestChown(t *testing.T) {
 	var bob uint32 = 1010
 	var root uint32 = 0
 
-	mount, err := cephfs.CreateMount()
+	mount, err := CreateMount()
 	assert.NoError(t, err)
 	require.NotNil(t, mount)