XL/FS: Rewrite in new format.

test-utils_test.go

@@ -44,6 +44,10 @@ func ExecObjectLayerTest(t *testing.T, objTest func(obj ObjectLayer, instanceTyp
 			}
 			erasureDisks = append(erasureDisks, path)
 		}
+
+		// Initialize name space lock.
+		initNSLock()
+
 		objLayer, err := newXLObjects(erasureDisks)
 		if err != nil {
 			return nil, nil, err
@@ -59,6 +63,9 @@ func ExecObjectLayerTest(t *testing.T, objTest func(obj ObjectLayer, instanceTyp
 			return nil, "", err
 		}
 
+		// Initialize name space lock.
+		initNSLock()
+
 		// Create the obj.
 		objLayer, err := newFSObjects(fsDir)
 		if err != nil {
@@ -80,7 +87,7 @@ func ExecObjectLayerTest(t *testing.T, objTest func(obj ObjectLayer, instanceTyp
 	}
 	// Executing the object layer tests for single node setup.
 	objTest(objLayer, singleNodeTestStr, t)
-	initNSLock()
+
 	objLayer, fsDirs, err := getXLObjectLayer()
 	if err != nil {
 		t.Fatalf("Initialization of object layer failed for XL setup: %s", err.Error())