@@ -178,7 +178,6 @@ func TestStatError(t *testing.T) {
178
178
defer chtmpdir (t )()
179
179
180
180
path := "no-such-file"
181
- Remove (path ) // Just in case
182
181
183
182
fi , err := Stat (path )
184
183
if err == nil {
@@ -194,12 +193,10 @@ func TestStatError(t *testing.T) {
194
193
testenv .MustHaveSymlink (t )
195
194
196
195
link := "symlink"
197
- Remove (link ) // Just in case
198
196
err = Symlink (path , link )
199
197
if err != nil {
200
198
t .Fatal (err )
201
199
}
202
- defer Remove (link )
203
200
204
201
fi , err = Stat (link )
205
202
if err == nil {
@@ -688,12 +685,10 @@ func TestHardLink(t *testing.T) {
688
685
689
686
defer chtmpdir (t )()
690
687
from , to := "hardlinktestfrom" , "hardlinktestto"
691
- Remove (from ) // Just in case.
692
688
file , err := Create (to )
693
689
if err != nil {
694
690
t .Fatalf ("open %q failed: %v" , to , err )
695
691
}
696
- defer Remove (to )
697
692
if err = file .Close (); err != nil {
698
693
t .Errorf ("close %q failed: %v" , to , err )
699
694
}
@@ -709,7 +704,6 @@ func TestHardLink(t *testing.T) {
709
704
t .Errorf ("link %q, %q failed to return a valid error" , none , none )
710
705
}
711
706
712
- defer Remove (from )
713
707
tostat , err := Stat (to )
714
708
if err != nil {
715
709
t .Fatalf ("stat %q failed: %v" , to , err )
@@ -745,11 +739,8 @@ func TestHardLink(t *testing.T) {
745
739
}
746
740
747
741
// chtmpdir changes the working directory to a new temporary directory and
748
- // provides a cleanup function. Used when PWD is read-only.
742
+ // provides a cleanup function.
749
743
func chtmpdir (t * testing.T ) func () {
750
- if runtime .GOOS != "darwin" || (runtime .GOARCH != "arm" && runtime .GOARCH != "arm64" ) {
751
- return func () {} // only needed on darwin/arm{,64}
752
- }
753
744
oldwd , err := Getwd ()
754
745
if err != nil {
755
746
t .Fatalf ("chtmpdir: %v" , err )
@@ -774,20 +765,17 @@ func TestSymlink(t *testing.T) {
774
765
775
766
defer chtmpdir (t )()
776
767
from , to := "symlinktestfrom" , "symlinktestto"
777
- Remove (from ) // Just in case.
778
768
file , err := Create (to )
779
769
if err != nil {
780
770
t .Fatalf ("Create(%q) failed: %v" , to , err )
781
771
}
782
- defer Remove (to )
783
772
if err = file .Close (); err != nil {
784
773
t .Errorf ("Close(%q) failed: %v" , to , err )
785
774
}
786
775
err = Symlink (to , from )
787
776
if err != nil {
788
777
t .Fatalf ("Symlink(%q, %q) failed: %v" , to , from , err )
789
778
}
790
- defer Remove (from )
791
779
tostat , err := Lstat (to )
792
780
if err != nil {
793
781
t .Fatalf ("Lstat(%q) failed: %v" , to , err )
@@ -841,12 +829,10 @@ func TestLongSymlink(t *testing.T) {
841
829
// Long, but not too long: a common limit is 255.
842
830
s = s + s + s + s + s + s + s + s + s + s + s + s + s + s + s
843
831
from := "longsymlinktestfrom"
844
- Remove (from ) // Just in case.
845
832
err := Symlink (s , from )
846
833
if err != nil {
847
834
t .Fatalf ("symlink %q, %q failed: %v" , s , from , err )
848
835
}
849
- defer Remove (from )
850
836
r , err := Readlink (from )
851
837
if err != nil {
852
838
t .Fatalf ("readlink %q failed: %v" , from , err )
@@ -859,9 +845,6 @@ func TestLongSymlink(t *testing.T) {
859
845
func TestRename (t * testing.T ) {
860
846
defer chtmpdir (t )()
861
847
from , to := "renamefrom" , "renameto"
862
- // Ensure we are not testing the overwrite case here.
863
- Remove (from )
864
- Remove (to )
865
848
866
849
file , err := Create (from )
867
850
if err != nil {
@@ -874,7 +857,6 @@ func TestRename(t *testing.T) {
874
857
if err != nil {
875
858
t .Fatalf ("rename %q, %q failed: %v" , to , from , err )
876
859
}
877
- defer Remove (to )
878
860
_ , err = Stat (to )
879
861
if err != nil {
880
862
t .Errorf ("stat %q failed: %v" , to , err )
@@ -884,9 +866,6 @@ func TestRename(t *testing.T) {
884
866
func TestRenameOverwriteDest (t * testing.T ) {
885
867
defer chtmpdir (t )()
886
868
from , to := "renamefrom" , "renameto"
887
- // Just in case.
888
- Remove (from )
889
- Remove (to )
890
869
891
870
toData := []byte ("to" )
892
871
fromData := []byte ("from" )
@@ -904,7 +883,6 @@ func TestRenameOverwriteDest(t *testing.T) {
904
883
if err != nil {
905
884
t .Fatalf ("rename %q, %q failed: %v" , to , from , err )
906
885
}
907
- defer Remove (to )
908
886
909
887
_ , err = Stat (from )
910
888
if err == nil {
@@ -925,9 +903,6 @@ func TestRenameOverwriteDest(t *testing.T) {
925
903
func TestRenameFailed (t * testing.T ) {
926
904
defer chtmpdir (t )()
927
905
from , to := "renamefrom" , "renameto"
928
- // Ensure we are not testing the overwrite case here.
929
- Remove (from )
930
- Remove (to )
931
906
932
907
err := Rename (from , to )
933
908
switch err := err .(type ) {
@@ -943,9 +918,6 @@ func TestRenameFailed(t *testing.T) {
943
918
}
944
919
case nil :
945
920
t .Errorf ("rename %q, %q: expected error, got nil" , from , to )
946
-
947
- // cleanup whatever was placed in "renameto"
948
- Remove (to )
949
921
default :
950
922
t .Errorf ("rename %q, %q: expected %T, got %T %v" , from , to , new (LinkError ), err , err )
951
923
}
@@ -956,7 +928,6 @@ func TestRenameNotExisting(t *testing.T) {
956
928
from , to := "doesnt-exist" , "dest"
957
929
958
930
Mkdir (to , 0777 )
959
- defer Remove (to )
960
931
961
932
if err := Rename (from , to ); ! IsNotExist (err ) {
962
933
t .Errorf ("Rename(%q, %q) = %v; want an IsNotExist error" , from , to , err )
@@ -967,12 +938,8 @@ func TestRenameToDirFailed(t *testing.T) {
967
938
defer chtmpdir (t )()
968
939
from , to := "renamefrom" , "renameto"
969
940
970
- Remove (from )
971
- Remove (to )
972
941
Mkdir (from , 0777 )
973
942
Mkdir (to , 0777 )
974
- defer Remove (from )
975
- defer Remove (to )
976
943
977
944
err := Rename (from , to )
978
945
switch err := err .(type ) {
@@ -988,9 +955,6 @@ func TestRenameToDirFailed(t *testing.T) {
988
955
}
989
956
case nil :
990
957
t .Errorf ("rename %q, %q: expected error, got nil" , from , to )
991
-
992
- // cleanup whatever was placed in "renameto"
993
- Remove (to )
994
958
default :
995
959
t .Errorf ("rename %q, %q: expected %T, got %T %v" , from , to , new (LinkError ), err , err )
996
960
}
@@ -1702,7 +1666,6 @@ func writeFile(t *testing.T, fname string, flag int, text string) string {
1702
1666
func TestAppend (t * testing.T ) {
1703
1667
defer chtmpdir (t )()
1704
1668
const f = "append.txt"
1705
- defer Remove (f )
1706
1669
s := writeFile (t , f , O_CREATE | O_TRUNC | O_RDWR , "new" )
1707
1670
if s != "new" {
1708
1671
t .Fatalf ("writeFile: have %q want %q" , s , "new" )
@@ -1769,13 +1732,11 @@ func TestSameFile(t *testing.T) {
1769
1732
if err != nil {
1770
1733
t .Fatalf ("Create(a): %v" , err )
1771
1734
}
1772
- defer Remove (fa .Name ())
1773
1735
fa .Close ()
1774
1736
fb , err := Create ("b" )
1775
1737
if err != nil {
1776
1738
t .Fatalf ("Create(b): %v" , err )
1777
1739
}
1778
- defer Remove (fb .Name ())
1779
1740
fb .Close ()
1780
1741
1781
1742
ia1 , err := Stat ("a" )
0 commit comments