From 809019d4eeaf490dd905e601d2171c89a0b056d9 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 28 Jan 2019 20:43:53 +0100 Subject: [PATCH] moves test files into testdata folder --- .../notifiers/config_reader_test.go | 24 +++++++++---------- .../test-configs/broken-yaml/broken.yaml | 0 .../test-configs/broken-yaml/not.yaml.text | 0 .../correct-properties-with-orgName.yaml | 0 .../correct-properties.yaml | 0 .../test-configs/double-default/default-1.yml | 0 .../double-default/default-2.yaml | 0 .../test-configs/empty/empty.yaml | 0 .../test-configs/empty_folder/.gitignore | 0 .../incorrect-settings.yaml | 0 .../no-required-fields.yaml | 0 .../two-notifications/two-notifications.yaml | 0 .../unknown-notifier/notification.yaml | 0 13 files changed, 12 insertions(+), 12 deletions(-) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/broken-yaml/broken.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/broken-yaml/not.yaml.text (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/correct-properties/correct-properties.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/double-default/default-1.yml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/double-default/default-2.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/empty/empty.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/empty_folder/.gitignore (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/incorrect-settings/incorrect-settings.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/no-required-fields/no-required-fields.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/two-notifications/two-notifications.yaml (100%) rename pkg/services/provisioning/notifiers/{ => testdata}/test-configs/unknown-notifier/notification.yaml (100%) diff --git a/pkg/services/provisioning/notifiers/config_reader_test.go b/pkg/services/provisioning/notifiers/config_reader_test.go index 18074d7614e..87645ee7d31 100644 --- a/pkg/services/provisioning/notifiers/config_reader_test.go +++ b/pkg/services/provisioning/notifiers/config_reader_test.go @@ -12,21 +12,21 @@ import ( ) var ( - logger = log.New("fake.log") - - correct_properties = "./test-configs/correct-properties" - incorrect_settings = "./test-configs/incorrect-settings" - no_required_fields = "./test-configs/no-required-fields" - correct_properties_with_orgName = "./test-configs/correct-properties-with-orgName" - brokenYaml = "./test-configs/broken-yaml" - doubleNotificationsConfig = "./test-configs/double-default" - emptyFolder = "./test-configs/empty_folder" - emptyFile = "./test-configs/empty" - twoNotificationsConfig = "./test-configs/two-notifications" - unknownNotifier = "./test-configs/unknown-notifier" + correct_properties = "./testdata/test-configs/correct-properties" + incorrect_settings = "./testdata/test-configs/incorrect-settings" + no_required_fields = "./testdata/test-configs/no-required-fields" + correct_properties_with_orgName = "./testdata/test-configs/correct-properties-with-orgName" + brokenYaml = "./testdata/test-configs/broken-yaml" + doubleNotificationsConfig = "./testdata/test-configs/double-default" + emptyFolder = "./testdata/test-configs/empty_folder" + emptyFile = "./testdata/test-configs/empty" + twoNotificationsConfig = "./testdata/test-configs/two-notifications" + unknownNotifier = "./testdata/test-configs/unknown-notifier" ) func TestNotificationAsConfig(t *testing.T) { + logger := log.New("fake.log") + Convey("Testing notification as configuration", t, func() { sqlstore.InitTestDB(t) diff --git a/pkg/services/provisioning/notifiers/test-configs/broken-yaml/broken.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/broken.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/broken-yaml/broken.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/broken.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/broken-yaml/not.yaml.text b/pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/not.yaml.text similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/broken-yaml/not.yaml.text rename to pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/not.yaml.text diff --git a/pkg/services/provisioning/notifiers/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/correct-properties/correct-properties.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/correct-properties/correct-properties.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/double-default/default-1.yml b/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-1.yml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/double-default/default-1.yml rename to pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-1.yml diff --git a/pkg/services/provisioning/notifiers/test-configs/double-default/default-2.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-2.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/double-default/default-2.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-2.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/empty/empty.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/empty/empty.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/empty/empty.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/empty/empty.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/empty_folder/.gitignore b/pkg/services/provisioning/notifiers/testdata/test-configs/empty_folder/.gitignore similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/empty_folder/.gitignore rename to pkg/services/provisioning/notifiers/testdata/test-configs/empty_folder/.gitignore diff --git a/pkg/services/provisioning/notifiers/test-configs/incorrect-settings/incorrect-settings.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/incorrect-settings/incorrect-settings.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/incorrect-settings/incorrect-settings.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/incorrect-settings/incorrect-settings.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/no-required-fields/no-required-fields.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/no-required-fields/no-required-fields.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/no-required-fields/no-required-fields.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/no-required-fields/no-required-fields.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/two-notifications/two-notifications.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/two-notifications/two-notifications.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/two-notifications/two-notifications.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/two-notifications/two-notifications.yaml diff --git a/pkg/services/provisioning/notifiers/test-configs/unknown-notifier/notification.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/unknown-notifier/notification.yaml similarity index 100% rename from pkg/services/provisioning/notifiers/test-configs/unknown-notifier/notification.yaml rename to pkg/services/provisioning/notifiers/testdata/test-configs/unknown-notifier/notification.yaml