Commit fed54568 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

Drop some debug printout.

parent cad36b13
...@@ -46,6 +46,7 @@ func main() { ...@@ -46,6 +46,7 @@ func main() {
}, },
} }
fmt.Printf("AutoUnionFs - Go-FUSE Version %v.\n", fuse.Version())
gofs := unionfs.NewAutoUnionFs(flag.Arg(1), options) gofs := unionfs.NewAutoUnionFs(flag.Arg(1), options)
pathfs := fuse.NewPathNodeFs(gofs, nil) pathfs := fuse.NewPathNodeFs(gofs, nil)
state, conn, err := fuse.MountNodeFileSystem(flag.Arg(0), pathfs, nil) state, conn, err := fuse.MountNodeFileSystem(flag.Arg(0), pathfs, nil)
......
...@@ -3,7 +3,6 @@ package fuse ...@@ -3,7 +3,6 @@ package fuse
import ( import (
"log" "log"
"os" "os"
"fmt"
) )
var _ = log.Println var _ = log.Println
...@@ -11,12 +10,10 @@ var _ = log.Println ...@@ -11,12 +10,10 @@ var _ = log.Println
func MountNodeFileSystem(mountpoint string, nodeFs NodeFileSystem, opts *FileSystemOptions) (*MountState, *FileSystemConnector, os.Error) { func MountNodeFileSystem(mountpoint string, nodeFs NodeFileSystem, opts *FileSystemOptions) (*MountState, *FileSystemConnector, os.Error) {
conn := NewFileSystemConnector(nodeFs, opts) conn := NewFileSystemConnector(nodeFs, opts)
mountState := NewMountState(conn) mountState := NewMountState(conn)
fmt.Printf("Go-FUSE Version %v.\nMounting...\n", Version())
err := mountState.Mount(mountpoint, nil) err := mountState.Mount(mountpoint, nil)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
fmt.Println("Mounted!")
return mountState, conn, nil return mountState, conn, nil
} }
......
...@@ -75,7 +75,6 @@ func writeToFile(path string, contents string) { ...@@ -75,7 +75,6 @@ func writeToFile(path string, contents string) {
func readFromFile(path string) string { func readFromFile(path string) string {
b, err := ioutil.ReadFile(path) b, err := ioutil.ReadFile(path)
fmt.Println(b)
CheckSuccess(err) CheckSuccess(err)
return string(b) return string(b)
} }
...@@ -265,7 +264,6 @@ func TestBasic(t *testing.T) { ...@@ -265,7 +264,6 @@ func TestBasic(t *testing.T) {
} }
checkMapEq(t, names, expected) checkMapEq(t, names, expected)
log.Println("new contents")
writeToFile(wd+"/mount/new", "new contents") writeToFile(wd+"/mount/new", "new contents")
if !fileExists(wd + "/rw/new") { if !fileExists(wd + "/rw/new") {
t.Errorf("missing file in rw layer", names) t.Errorf("missing file in rw layer", names)
...@@ -275,7 +273,6 @@ func TestBasic(t *testing.T) { ...@@ -275,7 +273,6 @@ func TestBasic(t *testing.T) {
if contents != "new contents" { if contents != "new contents" {
t.Errorf("read mismatch: '%v'", contents) t.Errorf("read mismatch: '%v'", contents)
} }
return
writeToFile(wd+"/mount/ro1", "promote me") writeToFile(wd+"/mount/ro1", "promote me")
if !fileExists(wd + "/rw/ro1") { if !fileExists(wd + "/rw/ro1") {
t.Errorf("missing file in rw layer", names) t.Errorf("missing file in rw layer", names)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment