Skip to content

Commit 142716d

Browse files
matthias-kloecknerwrouesnel
authored andcommitted
use check for tests
1 parent fce6b00 commit 142716d

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

postgres_exporter_test.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -86,66 +86,66 @@ func (s *FunctionalSuite) TestSemanticVersionColumnDiscard(c *C) {
8686
}
8787
}
8888

89-
func TestEnvironmentSettingWithSecretsFiles(t *testing.T) {
89+
// test read username and password from file
90+
func (s *FunctionalSuite) TestEnvironmentSettingWithSecretsFiles(c *C) {
9091

9192
err := os.Setenv("DATA_SOURCE_USER_FILE", "./tests/username_file")
92-
if err != nil {
93-
t.Errorf("DATA_SOURCE_USER_FILE could not be set")
94-
}
93+
c.Assert(err, IsNil)
94+
defer UnsetEnvironment(c, "DATA_SOURCE_USER_FILE")
9595

9696
err = os.Setenv("DATA_SOURCE_PASS_FILE", "./tests/userpass_file")
97-
if err != nil {
98-
t.Errorf("DATA_SOURCE_PASS_FILE could not be set")
99-
}
97+
c.Assert(err, IsNil)
98+
defer UnsetEnvironment(c, "DATA_SOURCE_PASS_FILE")
10099

101100
err = os.Setenv("DATA_SOURCE_URI", "localhost:5432/?sslmode=disable")
102-
if err != nil {
103-
t.Errorf("DATA_SOURCE_URI could not be set")
104-
}
101+
c.Assert(err, IsNil)
102+
defer UnsetEnvironment(c, "DATA_SOURCE_URI")
105103

106104
var expected = "postgresql://custom_username:custom_password@localhost:5432/?sslmode=disable"
107105

108106
dsn := getDataSource()
109107
if dsn != expected {
110-
t.Errorf("Expected Username to be read from file. Found=%v, expected=%v", dsn, expected)
108+
c.Errorf("Expected Username to be read from file. Found=%v, expected=%v", dsn, expected)
111109
}
112110
}
113111

114-
func TestEnvironmentSettingWithDns(t *testing.T) {
112+
// test read DATA_SOURCE_NAME from environment
113+
func (s *FunctionalSuite) TestEnvironmentSettingWithDns(c *C) {
115114

116115
envDsn := "postgresql://user:password@localhost:5432/?sslmode=enabled"
117116
err := os.Setenv("DATA_SOURCE_NAME", envDsn)
118-
if err != nil {
119-
t.Errorf("DATA_SOURCE_NAME could not be set")
120-
}
117+
c.Assert(err, IsNil)
118+
defer UnsetEnvironment(c, "DATA_SOURCE_NAME")
121119

122120
dsn := getDataSource()
123121
if dsn != envDsn {
124-
t.Errorf("Expected Username to be read from file. Found=%v, expected=%v", dsn, envDsn)
122+
c.Errorf("Expected Username to be read from file. Found=%v, expected=%v", dsn, envDsn)
125123
}
126124
}
127125

128-
// test DATA_SOURCE_NAME is used even if username and password environment wariables are set
129-
func TestEnvironmentSettingWithDnsAndSecrets(t *testing.T) {
126+
// test DATA_SOURCE_NAME is used even if username and password environment variables are set
127+
func (s *FunctionalSuite) TestEnvironmentSettingWithDnsAndSecrets(c *C) {
130128

131129
envDsn := "postgresql://userDsn:passwordDsn@localhost:55432/?sslmode=disabled"
132130
err := os.Setenv("DATA_SOURCE_NAME", envDsn)
133-
if err != nil {
134-
t.Errorf("DATA_SOURCE_NAME could not be set")
135-
}
131+
c.Assert(err, IsNil)
132+
defer UnsetEnvironment(c, "DATA_SOURCE_NAME")
136133

137134
err = os.Setenv("DATA_SOURCE_USER_FILE", "./tests/username_file")
138-
if err != nil {
139-
t.Errorf("DATA_SOURCE_USER_FILE could not be set")
140-
}
135+
c.Assert(err, IsNil)
136+
defer UnsetEnvironment(c, "DATA_SOURCE_USER_FILE")
141137

142138
err = os.Setenv("DATA_SOURCE_PASS", "envUserPass")
143-
if err != nil {
144-
t.Errorf("DATA_SOURCE_PASS could not be set")
145-
}
139+
c.Assert(err, IsNil)
140+
defer UnsetEnvironment(c, "DATA_SOURCE_PASS")
146141

147142
dsn := getDataSource()
148143
if dsn != envDsn {
149-
t.Errorf("Expected Username to be read from file. Found=%v, expected=%v", dsn, envDsn)
144+
c.Errorf("Expected Username to be read from file. Found=%v, expected=%v", dsn, envDsn)
150145
}
151146
}
147+
148+
func UnsetEnvironment(c *C, d string) {
149+
err := os.Unsetenv(d)
150+
c.Assert(err, IsNil)
151+
}

0 commit comments

Comments
 (0)