@@ -161,7 +161,7 @@ func TestMagic_String(t *testing.T) {
161
161
}
162
162
}
163
163
164
- func TestMagic_Path (t * testing.T ) {
164
+ func TestMagic_Paths (t * testing.T ) {
165
165
var mgc * Magic
166
166
var rv []string
167
167
@@ -184,9 +184,9 @@ func TestMagic_Path(t *testing.T) {
184
184
185
185
mgc .Close ()
186
186
187
- // XXX(krzysztof): Setting "MAGIC" here breaks tests later as it will
188
- // be persistent between different tests, sadly needed to be disabled
189
- // for the time being.
187
+ // Setting "MAGIC" here breaks tests later as it will be persistent
188
+ // between different tests, sadly needed to be disabled for the time
189
+ // being.
190
190
//
191
191
// p, err := os.Getwd()
192
192
// if err != nil {
@@ -203,9 +203,9 @@ func TestMagic_Path(t *testing.T) {
203
203
// t.Errorf("value given %q, want %q", v[0], p)
204
204
// }
205
205
206
- // TODO(kwilczynski): Test Magic.Load() affecting Magic.Path() as well. But
207
- // that requires working os.Clearenv() which is yet to be implemented as
208
- // per http://golang.org/src/pkg/syscall/env_unix.go?s=1772:1787#L101
206
+ // Test Magic.Load() affecting Magic.Path() as well. But that requires
207
+ // working os.Clearenv() which is yet to be implemented as per
208
+ // http://golang.org/src/pkg/syscall/env_unix.go?s=1772:1787#L101
209
209
210
210
mgc , _ = open ()
211
211
defer func () {
@@ -218,11 +218,7 @@ func TestMagic_Path(t *testing.T) {
218
218
}
219
219
}
220
220
221
- func TestMagic_Path_Environment (t * testing.T ) {
222
- if ok , v := oldGoVersion (); ok {
223
- skip (t , fmt .Sprintf ("this version of the Go Language is too old: %s" , v ))
224
- return // Should not me reachable on modern Go version.
225
- }
221
+ func TestMagic_Paths_Environment (t * testing.T ) {
226
222
}
227
223
228
224
func TestMagic_Parameter (t * testing.T ) {
@@ -448,10 +444,6 @@ func TestMagic_Load(t *testing.T) {
448
444
}
449
445
450
446
func TestMagic_Load_Environment (t * testing.T ) {
451
- if ok , v := oldGoVersion (); ok {
452
- skip (t , fmt .Sprintf ("this version of the Go Language is too old: %s" , v ))
453
- return // Should not me reachable on modern Go version.
454
- }
455
447
}
456
448
457
449
func TestMagic_Compile (t * testing.T ) {
0 commit comments