shelltest

marcalff · marcalff · commit 69aa84bff120 · 2025-07-19T00:52:37.000+02:00
diff --git a/functional/configuration/main.cc b/functional/configuration/main.cc
@@ -211,7 +211,7 @@ void CleanupOtel()
 static void usage(FILE *out)
 {
   static const char *msg =
-      "Usage: example_yaml [options]\n"
+      "Usage: otel_configuration_check [options]\n"
       "Valid options are:\n"
       "  --help            Print this help\n"
       "  --yaml            Path to a yaml configuration file\n"
diff --git a/functional/configuration/run_test.sh b/functional/configuration/run_test.sh
@@ -15,15 +15,5 @@ export TEST_BIN_DIR="${BUILD_DIR}/functional/configuration/"
 
 export PATH=${PATH}:${TEST_BIN_DIR}
 
-which otel_configuration_check
-
-# otel_configuration_check --help
-
-which shelltest || true
-
-shelltest --version || true
-
-shelltest --help || true
-
 shelltest ./shelltests
 
diff --git a/functional/configuration/shelltests/disabled_empty.test b/functional/configuration/shelltests/disabled_empty.test
@@ -1,4 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-otel_configuration_check --yaml shelltests/disabled_empty.yaml
+$ otel_configuration_check --yaml shelltests/disabled_empty.yaml
+>
+MODEL PARSED
+SDK CREATED
+>= 0
diff --git a/functional/configuration/shelltests/disabled_empty.yaml b/functional/configuration/shelltests/disabled_empty.yaml
@@ -1,5 +1,5 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-format: 0.0
+file_format: 0.0
 disabled:
diff --git a/functional/configuration/shelltests/disabled_false.test b/functional/configuration/shelltests/disabled_false.test
@@ -1,4 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-otel_configuration_check --yaml shelltests/disabled_false.yaml
+$ otel_configuration_check --yaml shelltests/disabled_false.yaml
+>
+MODEL PARSED
+SDK CREATED
+>= 0
diff --git a/functional/configuration/shelltests/disabled_false.yaml b/functional/configuration/shelltests/disabled_false.yaml
@@ -1,5 +1,5 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-format: 0.0
+file_format: 0.0
 disabled: false
diff --git a/functional/configuration/shelltests/disabled_true.test b/functional/configuration/shelltests/disabled_true.test
@@ -1,4 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-otel_configuration_check --yaml shelltests/disabled_true.yaml
+$ otel_configuration_check --yaml shelltests/disabled_true.yaml
+>
+MODEL PARSED
+SDK CREATED
+>= 0
diff --git a/functional/configuration/shelltests/disabled_true.yaml b/functional/configuration/shelltests/disabled_true.yaml
@@ -1,5 +1,5 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-format: 0.0
+file_format: 0.0
 disabled: true
diff --git a/functional/configuration/shelltests/empty.test b/functional/configuration/shelltests/empty.test
@@ -1,4 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-otel_configuration_check --yaml shelltests/empty.yaml
+$ otel_configuration_check --yaml shelltests/empty.yaml
+>
+[ERROR] [Yaml Configuration Parser] Parse failed with exception: Yaml: not a map, looking for: file_format
+FAILED TO PARSE MODEL
+>= 1
diff --git a/functional/configuration/shelltests/format_empty.test b/functional/configuration/shelltests/format_empty.test
@@ -1,4 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-otel_configuration_check --yaml shelltests/format_empty.yaml
+$ otel_configuration_check --yaml shelltests/format_empty.yaml
+>
+[ERROR] [Yaml Configuration Parser] Parse failed with exception: Yaml: string value is empty: file_format
+FAILED TO PARSE MODEL
+>= 1
diff --git a/functional/configuration/shelltests/format_empty.yaml b/functional/configuration/shelltests/format_empty.yaml
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # This must fail
-format:
+file_format:

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ void CleanupOtel()`
`211`	`211`	`static void usage(FILE *out)`
`212`	`212`	`{`
`213`	`213`	`static const char *msg =`
`214`		`- "Usage: example_yaml [options]\n"`
	`214`	`+ "Usage: otel_configuration_check [options]\n"`
`215`	`215`	`"Valid options are:\n"`
`216`	`216`	`" --help Print this help\n"`
`217`	`217`	`" --yaml Path to a yaml configuration file\n"`