Index: src/pkg/os/os_test.go |
=================================================================== |
--- a/src/pkg/os/os_test.go |
+++ b/src/pkg/os/os_test.go |
@@ -60,7 +60,7 @@ |
}() |
func size(name string, t *testing.T) int64 { |
- file, err := Open(name, O_RDONLY, 0) |
+ file, err := Open(name) |
defer file.Close() |
if err != nil { |
t.Fatal("open failed:", err) |
@@ -125,7 +125,7 @@ |
func TestFstat(t *testing.T) { |
path := sfdir + "/" + sfname |
- file, err1 := Open(path, O_RDONLY, 0) |
+ file, err1 := Open(path) |
defer file.Close() |
if err1 != nil { |
t.Fatal("open failed:", err1) |
@@ -159,7 +159,7 @@ |
} |
func testReaddirnames(dir string, contents []string, t *testing.T) { |
- file, err := Open(dir, O_RDONLY, 0) |
+ file, err := Open(dir) |
defer file.Close() |
if err != nil { |
t.Fatalf("open %q failed: %v", dir, err) |
@@ -188,7 +188,7 @@ |
} |
func testReaddir(dir string, contents []string, t *testing.T) { |
- file, err := Open(dir, O_RDONLY, 0) |
+ file, err := Open(dir) |
defer file.Close() |
if err != nil { |
t.Fatalf("open %q failed: %v", dir, err) |
@@ -249,7 +249,7 @@ |
if syscall.OS == "windows" { |
dir = Getenv("SystemRoot") + "\\system32" |
} |
- file, err := Open(dir, O_RDONLY, 0) |
+ file, err := Open(dir) |
defer file.Close() |
if err != nil { |
t.Fatalf("open %q failed: %v", dir, err) |
@@ -258,7 +258,7 @@ |
if err1 != nil { |
t.Fatalf("readdirnames %q failed: %v", dir, err1) |
} |
- file1, err2 := Open(dir, O_RDONLY, 0) |
+ file1, err2 := Open(dir) |
if err2 != nil { |
t.Fatalf("open %q failed: %v", dir, err2) |
} |
@@ -277,7 +277,7 @@ |
} |
from, to := "hardlinktestfrom", "hardlinktestto" |
Remove(from) // Just in case. |
- file, err := Open(to, O_CREAT|O_WRONLY, 0666) |
+ file, err := Create(to) |
if err != nil { |
t.Fatalf("open %q failed: %v", to, err) |
} |
@@ -310,7 +310,7 @@ |
} |
from, to := "symlinktestfrom", "symlinktestto" |
Remove(from) // Just in case. |
- file, err := Open(to, O_CREAT|O_WRONLY, 0666) |
+ file, err := Create(to) |
if err != nil { |
t.Fatalf("open %q failed: %v", to, err) |
} |
@@ -358,7 +358,7 @@ |
if s != to { |
t.Fatalf("after symlink %q != %q", s, to) |
} |
- file, err = Open(from, O_RDONLY, 0) |
+ file, err = Open(from) |
if err != nil { |
t.Fatalf("open %q failed: %v", from, err) |
} |
@@ -392,7 +392,7 @@ |
func TestRename(t *testing.T) { |
from, to := "renamefrom", "renameto" |
Remove(to) // Just in case. |
- file, err := Open(from, O_CREAT|O_WRONLY, 0666) |
+ file, err := Create(from) |
if err != nil { |
t.Fatalf("open %q failed: %v", to, err) |
} |
@@ -619,7 +619,7 @@ |
if syscall.OS == "windows" { |
return |
} |
- fd, err := Open(".", O_RDONLY, 0) |
+ fd, err := Open(".") |
if err != nil { |
t.Fatalf("Open .: %s", err) |
} |
@@ -631,7 +631,7 @@ |
if mode == 0 { |
err = Chdir(d) |
} else { |
- fd1, err := Open(d, O_RDONLY, 0) |
+ fd1, err := Open(d) |
if err != nil { |
t.Errorf("Open %s: %s", d, err) |
continue |
@@ -740,7 +740,7 @@ |
func TestOpenError(t *testing.T) { |
for _, tt := range openErrorTests { |
- f, err := Open(tt.path, tt.mode, 0) |
+ f, err := OpenFile(tt.path, tt.mode, 0) |
if err == nil { |
t.Errorf("Open(%q, %d) succeeded", tt.path, tt.mode) |
f.Close() |
@@ -846,7 +846,7 @@ |
} |
func writeFile(t *testing.T, fname string, flag int, text string) string { |
- f, err := Open(fname, flag, 0666) |
+ f, err := OpenFile(fname, flag, 0666) |
if err != nil { |
t.Fatalf("Open: %v", err) |
} |
@@ -865,7 +865,7 @@ |
func TestAppend(t *testing.T) { |
const f = "append.txt" |
defer Remove(f) |
- s := writeFile(t, f, O_CREAT|O_TRUNC|O_RDWR, "new") |
+ s := writeFile(t, f, O_CREATE|O_TRUNC|O_RDWR, "new") |
if s != "new" { |
t.Fatalf("writeFile: have %q want %q", s, "new") |
} |