pkg/fs: osxfuse version check shouldn't depend on map ordering

also, use fuse.OSXFUSELocationV3 and V2 for path info
they're exported for this sort of thing

Change-Id: If94024b944c419ced8760d904f521201916a5359

pkg/fs/fs_test.go

@@ -36,6 +36,7 @@ import (
 	"testing"
 	"time"
 
+	"bazil.org/fuse"
 	"bazil.org/fuse/syscallx"
 	"camlistore.org/pkg/test"
 )
@@ -52,25 +53,26 @@ func condSkip(t *testing.T) {
 		t.Skipf("Skipping test on OS %q", runtime.GOOS)
 	}
 	if runtime.GOOS == "darwin" {
-		// The first path is osxfuse 3.x, the second is 2.x.
 		// TODO: simplify if/when bazil drops 2.x support.
-		osxFusePathToMarkers := map[string]string{
+		_, err := os.Stat(fuse.OSXFUSELocationV3.Mount)
-			"/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse": "cammount@osxfuse",
+		if err == nil {
-			"/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs":        "mount_osxfusefs@",
+			osxFuseMarker = "cammount@osxfuse"
+			return
 		}
-		for path, marker := range osxFusePathToMarkers {
+		if !os.IsNotExist(err) {
-			_, err := os.Stat(path)
+			t.Fatal(err)
-			if err == nil {
-				osxFuseMarker = marker
-				break
-			}
-			if !os.IsNotExist(err) {
-				t.Fatal(err)
-			}
 		}
-		if osxFuseMarker == "" {
+		_, err = os.Stat(fuse.OSXFUSELocationV2.Mount)
-			test.DependencyErrorOrSkip(t)
+		if err == nil {
+			osxFuseMarker = "mount_osxfusefs@"
+			// TODO(mpl): add a similar check/warning to pkg/fs or cammount.
+			t.Log("OSXFUSE version 2.x detected. Please consider upgrading to v 3.x.")
+			return
 		}
+		if !os.IsNotExist(err) {
+			t.Fatal(err)
+		}
+		test.DependencyErrorOrSkip(t)
 	}
 }