Просмотр исходного кода

moves test files into testdata folder

bergquist 7 лет назад
Родитель
Сommit
809019d4ee

+ 12 - 12
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)
 

+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/broken-yaml/broken.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/broken.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/broken-yaml/not.yaml.text → pkg/services/provisioning/notifiers/testdata/test-configs/broken-yaml/not.yaml.text


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties-with-orgName/correct-properties-with-orgName.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/correct-properties/correct-properties.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/double-default/default-1.yml → pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-1.yml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/double-default/default-2.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/double-default/default-2.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/empty/empty.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/empty/empty.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/empty_folder/.gitignore → pkg/services/provisioning/notifiers/testdata/test-configs/empty_folder/.gitignore


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/incorrect-settings/incorrect-settings.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/incorrect-settings/incorrect-settings.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/no-required-fields/no-required-fields.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/no-required-fields/no-required-fields.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/two-notifications/two-notifications.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/two-notifications/two-notifications.yaml


+ 0 - 0
pkg/services/provisioning/notifiers/test-configs/unknown-notifier/notification.yaml → pkg/services/provisioning/notifiers/testdata/test-configs/unknown-notifier/notification.yaml