From 284b7d6667ae956dbeb2a169a5408d05889714e4 Mon Sep 17 00:00:00 2001 From: Jesse Schmidt Date: Tue, 9 Jan 2024 15:12:45 -0600 Subject: [PATCH] rm sleep --- integration_test.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/integration_test.go b/integration_test.go index ce95e1b..b3a8bb0 100644 --- a/integration_test.go +++ b/integration_test.go @@ -90,18 +90,18 @@ func TestMain(m *testing.M) { } var testFiles = []testutils.TestData{ - // { - // Source: filepath.Join(sourcePath, "all_flash_cluster_cr.yaml"), - // Destination: filepath.Join(destinationPath, "all_flash_cluster_cr.conf"), - // Expected: filepath.Join(expectedPath, "all_flash_cluster_cr.conf"), - // Arguments: []string{"convert", "-a", "6.2.0.2", "-o", destinationPath}, - // }, - // { - // Source: filepath.Join(sourcePath, "multiple_feature_key_paths.yaml"), - // Destination: filepath.Join(destinationPath, "multiple_feature_key_paths.conf"), - // Expected: filepath.Join(expectedPath, "multiple_feature_key_paths.conf"), - // Arguments: []string{"convert", "-a", "6.2.0.2", "-o", destinationPath}, - // }, + { + Source: filepath.Join(sourcePath, "all_flash_cluster_cr.yaml"), + Destination: filepath.Join(destinationPath, "all_flash_cluster_cr.conf"), + Expected: filepath.Join(expectedPath, "all_flash_cluster_cr.conf"), + Arguments: []string{"convert", "-a", "6.2.0.2", "-o", destinationPath}, + }, + { + Source: filepath.Join(sourcePath, "multiple_feature_key_paths.yaml"), + Destination: filepath.Join(destinationPath, "multiple_feature_key_paths.conf"), + Expected: filepath.Join(expectedPath, "multiple_feature_key_paths.conf"), + Arguments: []string{"convert", "-a", "6.2.0.2", "-o", destinationPath}, + }, { Source: filepath.Join(sourcePath, "dim_nostorage_cluster_cr.yaml"), Destination: filepath.Join(destinationPath, "dim_nostorage_cluster_cr.conf"), @@ -311,7 +311,6 @@ func TestYamlToConf(t *testing.T) { if !tf.SkipServerTest { version := getVersion(tf.Arguments) id := runServer(version, confPath, dockerClient, t, tf) - time.Sleep(time.Second * 1000) time.Sleep(time.Second * 3) // need this to allow logs to accumulate