public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2717 from sileht/sileht/dataproxy_test-bug

Browse Source 
Fix dataproxy_test.go tests
This commit is contained in:
Torkel Ödegaard
2015-09-10 15:51:02 +02:00
parent ec3a684be2 6e532231dc
commit 96af2debfc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dataproxy_test.go
+4 -2
View File
@@ -14,7 +14,8 @@ func TestDataSourceProxy(t *testing.T) {
Convey("When getting graphite datasource proxy", t, func() { Convey("When getting graphite datasource proxy", t, func() {
ds := m.DataSource{Url: "htttp://graphite:8080", Type: m.DS_GRAPHITE} ds := m.DataSource{Url: "htttp://graphite:8080", Type: m.DS_GRAPHITE}
proxy := NewReverseProxy(&ds, "/render") targetUrl, _ := url.Parse(ds.Url)
proxy := NewReverseProxy(&ds, "/render", targetUrl)
requestUrl, _ := url.Parse("http://grafana.com/sub") requestUrl, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestUrl} req := http.Request{URL: requestUrl}
@@ -36,7 +37,8 @@ func TestDataSourceProxy(t *testing.T) {
Password: "password", Password: "password",
} }
proxy := NewReverseProxy(&ds, "") targetUrl, _ := url.Parse(ds.Url)
proxy := NewReverseProxy(&ds, "", targetUrl)
requestUrl, _ := url.Parse("http://grafana.com/sub") requestUrl, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestUrl} req := http.Request{URL: requestUrl}