@@ -28,36 +28,14 @@ import (
28
28
29
29
func TestRetrieve (t * testing.T ) {
30
30
var (
31
- validSecret = "qaRZGEbnQNNvmaeTLqy8Bxs22wLZ6H7obIiNSveTLPdoQuylANnuy6WBOw16XoqH"
32
- validClient = "CQ4iZ5sebOfhGRwUn3IV0r1YFMNrMTIx"
33
- validConfig = & Config {validClient , validSecret }
34
- invalidConfig = & Config {"" , validSecret }
35
- clientEnv = EnvPrefix + "_CLIENT"
36
- secretEnv = EnvPrefix + "_SECRET"
37
- clientEnvBackup * string
38
- secretEnvBackup * string
31
+ validSecret = "qaRZGEbnQNNvmaeTLqy8Bxs22wLZ6H7obIiNSveTLPdoQuylANnuy6WBOw16XoqH"
32
+ validClient = "CQ4iZ5sebOfhGRwUn3IV0r1YFMNrMTIx"
33
+ validConfig = & Config {validClient , validSecret }
34
+ invalidConfig = & Config {"" , validSecret }
35
+ clientEnv = EnvPrefix + "_CLIENT"
36
+ secretEnv = EnvPrefix + "_SECRET"
39
37
)
40
38
41
- // Preserve user environment variables when executing this test
42
- _ = func () {
43
- if c , ok := os .LookupEnv (clientEnv ); ok {
44
- clientEnvBackup = & c
45
- }
46
- if s , ok := os .LookupEnv (secretEnv ); ok {
47
- secretEnvBackup = & s
48
- }
49
- }
50
- _ = func () {
51
- if clientEnvBackup != nil {
52
- os .Setenv (clientEnv , * clientEnvBackup )
53
- clientEnvBackup = nil
54
- }
55
- if secretEnvBackup != nil {
56
- os .Setenv (secretEnv , * secretEnvBackup )
57
- secretEnvBackup = nil
58
- }
59
- }
60
-
61
39
tests := []struct {
62
40
name string
63
41
pre func ()
@@ -68,14 +46,12 @@ func TestRetrieve(t *testing.T) {
68
46
{
69
47
name : "valid config written in env" ,
70
48
pre : func () {
71
- // pushEnv()
72
49
os .Setenv (clientEnv , validConfig .Client )
73
50
os .Setenv (secretEnv , validConfig .Secret )
74
51
},
75
52
post : func () {
76
53
os .Unsetenv (clientEnv )
77
54
os .Unsetenv (secretEnv )
78
- // popEnv()
79
55
},
80
56
wantedConfig : validConfig ,
81
57
wantedErr : false ,
@@ -84,14 +60,12 @@ func TestRetrieve(t *testing.T) {
84
60
{
85
61
name : "invalid config written in env" ,
86
62
pre : func () {
87
- // pushEnv()
88
63
os .Setenv (clientEnv , validConfig .Client )
89
64
os .Setenv (secretEnv , "" )
90
65
},
91
66
post : func () {
92
67
os .Unsetenv (clientEnv )
93
68
os .Unsetenv (secretEnv )
94
- // popEnv()
95
69
},
96
70
wantedConfig : nil ,
97
71
wantedErr : true ,
0 commit comments