From df3c6dae2e9374d3fb6d1fcbf2d7898bc8d19822 Mon Sep 17 00:00:00 2001
From: John Mulligan <jmulligan@redhat.com>
Date: Mon, 21 Jun 2021 14:30:47 -0400
Subject: [PATCH] cephfs admin: add newFSAdmin func for setting up fsadmin test
 instances

Previously, the getFSAdmin function always fetched a cached (if
available) fsadmin instance set up for the default configuration of
ceph. This change makes getFSAdmin based on newFSAdmin a function
that always returns a new instance and allows a custom configuration
to be passed.

Otherwise, newFSAdmin works like getFSAdmin did previously, supporting
debugging via an environment variable.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---
 cephfs/admin/fsadmin_test.go | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/cephfs/admin/fsadmin_test.go b/cephfs/admin/fsadmin_test.go
index ef0f466..63dc5e7 100644
--- a/cephfs/admin/fsadmin_test.go
+++ b/cephfs/admin/fsadmin_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ceph/go-ceph/internal/commands"
+	"github.com/ceph/go-ceph/rados"
 )
 
 var (
@@ -61,20 +62,34 @@ func getFSAdmin(t *testing.T) *FSAdmin {
 	if cachedFSAdmin != nil {
 		return cachedFSAdmin
 	}
-	fsa, err := New()
+	cachedFSAdmin = newFSAdmin(t, "")
+	return cachedFSAdmin
+}
+
+func newFSAdmin(t *testing.T, configFile string) *FSAdmin {
+	conn, err := rados.NewConn()
 	require.NoError(t, err)
-	require.NotNil(t, fsa)
-	// We steal the connection set up by the New() method and wrap it in an
-	// optional tracer.
-	c := fsa.conn
-	if debugTrace {
-		c = commands.NewTraceCommander(c)
+	if configFile == "" {
+		err = conn.ReadDefaultConfigFile()
+		require.NoError(t, err)
+	} else {
+		err = conn.ReadConfigFile(configFile)
+		require.NoError(t, err)
 	}
-	cachedFSAdmin = NewFromConn(c)
+	err = conn.Connect()
+	require.NoError(t, err)
+
+	var cmdr RadosCommander = conn
+	if debugTrace {
+		// We wrap the "real" connection, which meets the RadosCommander interface,
+		// with a trace commander when debugTrace is set.
+		cmdr = commands.NewTraceCommander(conn)
+	}
+
 	// We sleep briefly before returning in order to ensure we have a mgr map
 	// before we start executing the tests.
 	time.Sleep(50 * time.Millisecond)
-	return cachedFSAdmin
+	return NewFromConn(cmdr)
 }
 
 func TestInvalidFSAdmin(t *testing.T) {