Skip to content

N
nexpie-grafana-theme
Commit 87308fd9 by bergquist
Options

fixes broken tests 💥

parent 16b1c0e6
Showing with 7 additions and 4 deletions
pkg/components/imguploader/gcsuploader_test.go
package imguploader package imguploader
import ( import (
"context"
"testing" "testing"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
...@@ -15,7 +16,7 @@ func TestUploadToGCS(t *testing.T) { ...@@ -15,7 +16,7 @@ func TestUploadToGCS(t *testing.T) {
gcsUploader, _ := NewImageUploader() gcsUploader, _ := NewImageUploader()
path, err := gcsUploader.Upload("../../../public/img/logo_transparent_400x.png") path, err := gcsUploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(path, ShouldNotEqual, "") So(path, ShouldNotEqual, "")
......
pkg/components/imguploader/s3uploader_test.go
package imguploader package imguploader
import ( import (
"context"
"testing" "testing"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
...@@ -15,7 +16,7 @@ func TestUploadToS3(t *testing.T) { ...@@ -15,7 +16,7 @@ func TestUploadToS3(t *testing.T) {
s3Uploader, _ := NewImageUploader() s3Uploader, _ := NewImageUploader()
path, err := s3Uploader.Upload("../../../public/img/logo_transparent_400x.png") path, err := s3Uploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(path, ShouldNotEqual, "") So(path, ShouldNotEqual, "")
......
pkg/components/imguploader/webdavuploader_test.go
package imguploader package imguploader
import ( import (
"context"
"testing" "testing"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
...@@ -11,7 +12,7 @@ func TestUploadToWebdav(t *testing.T) { ...@@ -11,7 +12,7 @@ func TestUploadToWebdav(t *testing.T) {
// Can be tested with this docker container: https://hub.docker.com/r/morrisjobke/webdav/ // Can be tested with this docker container: https://hub.docker.com/r/morrisjobke/webdav/
SkipConvey("[Integration test] for external_image_store.webdav", t, func() { SkipConvey("[Integration test] for external_image_store.webdav", t, func() {
webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "") webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "")
path, err := webdavUploader.Upload("../../../public/img/logo_transparent_400x.png") path, err := webdavUploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(path, ShouldStartWith, "http://localhost:8888/webdav/") So(path, ShouldStartWith, "http://localhost:8888/webdav/")
...@@ -19,7 +20,7 @@ func TestUploadToWebdav(t *testing.T) { ...@@ -19,7 +20,7 @@ func TestUploadToWebdav(t *testing.T) {
SkipConvey("[Integration test] for external_image_store.webdav with public url", t, func() { SkipConvey("[Integration test] for external_image_store.webdav with public url", t, func() {
webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "http://publicurl:8888/webdav") webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "http://publicurl:8888/webdav")
path, err := webdavUploader.Upload("../../../public/img/logo_transparent_400x.png") path, err := webdavUploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(path, ShouldStartWith, "http://publicurl:8888/webdav/") So(path, ShouldStartWith, "http://publicurl:8888/webdav/")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment