Replace check for integration tests. (#110707)
* Replace check for integration tests. * Revert changes in pkg/tsdb/mysql packages. * Fix formatting of few tests.
This commit is contained in:
@@ -43,6 +43,7 @@ import (
|
||||
"github.com/grafana/grafana/pkg/services/user"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
"github.com/grafana/grafana/pkg/tests/testsuite"
|
||||
"github.com/grafana/grafana/pkg/util/testutil"
|
||||
"github.com/grafana/grafana/pkg/web"
|
||||
)
|
||||
|
||||
@@ -51,9 +52,8 @@ func TestMain(m *testing.M) {
|
||||
}
|
||||
|
||||
func TestIntegrationParseMetricRequest(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skipping integration test in short mode")
|
||||
}
|
||||
testutil.SkipIntegrationTestInShortMode(t)
|
||||
|
||||
t.Run("Test a simple single datasource query", func(t *testing.T) {
|
||||
tc := setup(t, false, nil)
|
||||
mr := metricRequestWithQueries(t, `{
|
||||
@@ -468,9 +468,8 @@ func TestIntegrationParseMetricRequest(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestIntegrationQueryDataMultipleSources(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skipping integration test in short mode")
|
||||
}
|
||||
testutil.SkipIntegrationTestInShortMode(t)
|
||||
|
||||
t.Run("can query multiple datasources", func(t *testing.T) {
|
||||
tc := setup(t, false, nil)
|
||||
query1, err := simplejson.NewJson([]byte(`
|
||||
@@ -654,9 +653,8 @@ func TestIntegrationQueryDataMultipleSources(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestIntegrationQueryDataWithQSDSClient(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skipping integration test in short mode")
|
||||
}
|
||||
testutil.SkipIntegrationTestInShortMode(t)
|
||||
|
||||
t.Run("can run a simple datasource query with a mt ds client", func(t *testing.T) {
|
||||
stubbedResponse := &backend.QueryDataResponse{Responses: make(backend.Responses)}
|
||||
testClient := &testClient{
|
||||
|
||||
Reference in New Issue
Block a user