RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1670 from gregorygtseng/tls-servername-const 

Unexport testing constant
This commit is contained in:
Brian Brazil 2016-05-26 22:49:39 +01:00
parent bd6568ccc9 4ceedffe86
commit f55a1d463d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retrieval/target_test.go
View File

@ -32,7 +32,7 @@ import (
)
const (
CAFilePath = "testdata/ca.cer"
caCertPath = "testdata/ca.cer"
)
func TestTargetLabels(t *testing.T) {
@ -239,7 +239,7 @@ func TestNewHTTPCACert(t *testing.T) {
cfg := &config.ScrapeConfig{
ScrapeTimeout: model.Duration(1 * time.Second),
TLSConfig: config.TLSConfig{
CAFile: CAFilePath,
CAFile: caCertPath,
},
}
c, err := newHTTPClient(cfg)
@ -272,7 +272,7 @@ func TestNewHTTPClientCert(t *testing.T) {
cfg := &config.ScrapeConfig{
ScrapeTimeout: model.Duration(1 * time.Second),
TLSConfig: config.TLSConfig{
CAFile: CAFilePath,
CAFile: caCertPath,
CertFile: "testdata/client.cer",
KeyFile: "testdata/client.key",
},
@ -303,7 +303,7 @@ func TestNewHTTPWithServerName(t *testing.T) {
cfg := &config.ScrapeConfig{
ScrapeTimeout: model.Duration(1 * time.Second),
TLSConfig: config.TLSConfig{
CAFile: CAFilePath,
CAFile: caCertPath,
ServerName: "prometheus.rocks",
},
}
@ -333,7 +333,7 @@ func TestNewHTTPWithBadServerName(t *testing.T) {
cfg := &config.ScrapeConfig{
ScrapeTimeout: model.Duration(1 * time.Second),
TLSConfig: config.TLSConfig{
CAFile: CAFilePath,
CAFile: caCertPath,
ServerName: "badname",
},
}
@ -350,7 +350,7 @@ func TestNewHTTPWithBadServerName(t *testing.T) {
func newTLSConfig(certName string, t *testing.T) *tls.Config {
tlsConfig := &tls.Config{}
caCertPool := x509.NewCertPool()
caCert, err := ioutil.ReadFile(CAFilePath)
caCert, err := ioutil.ReadFile(caCertPath)
if err != nil {
t.Fatalf("Couldn't set up TLS server: %v", err)
}