Reorder and add tests

Author: jeremydvoss

opentelemetry-sdk/tests/test_configurator.py

@@ -677,35 +677,6 @@ def test_logging_init_exporter(self):
         getLogger(__name__).error("hello")
         self.assertTrue(provider.processor.exporter.export_called)
 
-    @patch.dict(environ, {}, clear=True)
-    def test_otel_log_level_by_name_default(self):
-        self.assertEqual(_get_log_level(), NOTSET)
-
-    @patch.dict(environ, {"OTEL_LOG_LEVEL": "NOTSET "}, clear=True)
-    def test_otel_log_level_by_name_notset(self):
-        self.assertEqual(_get_log_level(), NOTSET)
-
-    @patch.dict(environ, {"OTEL_LOG_LEVEL": " DeBug "}, clear=True)
-    def test_otel_log_level_by_name_debug(self):
-        self.assertEqual(_get_log_level(), DEBUG)
-
-    @patch.dict(environ, {"OTEL_LOG_LEVEL": " info "}, clear=True)
-    def test_otel_log_level_by_name_info(self):
-        self.assertEqual(_get_log_level(), INFO)
-
-    @patch.dict(environ, {"OTEL_LOG_LEVEL": " warn"}, clear=True)
-    def test_otel_log_level_by_name_warn(self):
-        self.assertEqual(_get_log_level(), WARNING)
-
-    @patch.dict(environ, {"OTEL_LOG_LEVEL": " warnING "}, clear=True)
-    def test_otel_log_level_by_name_warning(self):
-        self.assertEqual(_get_log_level(), WARNING)
-
-    @patch.dict(environ, {"OTEL_LOG_LEVEL": " eRroR"}, clear=True)
-    def test_otel_log_level_by_name_error(self):
-        self.assertEqual(_get_log_level(), ERROR)
-
-
     @patch.dict(
         environ,
         {
@@ -716,7 +687,6 @@ def test_otel_log_level_by_name_error(self):
     )
     @patch("opentelemetry.sdk._configuration._get_log_level", return_value=39)
     def test_logging_init_exporter_level_under(self, log_level_mock):
-        # log_level_mock.return_value = 39
         resource = Resource.create({})
         _init_logging(
             {"otlp": DummyOTLPLogExporter},
@@ -850,6 +820,38 @@ def test_logging_init_exporter_without_handler_setup(self):
             if isinstance(handler, LoggingHandler):
                 self.fail()
 
+    @patch.dict(environ, {}, clear=True)
+    def test_otel_log_level_by_name_default(self):
+        self.assertEqual(_get_log_level(), NOTSET)
+
+    @patch.dict(environ, {"OTEL_LOG_LEVEL": "NOTSET "}, clear=True)
+    def test_otel_log_level_by_name_notset(self):
+        self.assertEqual(_get_log_level(), NOTSET)
+
+    @patch.dict(environ, {"OTEL_LOG_LEVEL": " DeBug "}, clear=True)
+    def test_otel_log_level_by_name_debug(self):
+        self.assertEqual(_get_log_level(), DEBUG)
+
+    @patch.dict(environ, {"OTEL_LOG_LEVEL": " info "}, clear=True)
+    def test_otel_log_level_by_name_info(self):
+        self.assertEqual(_get_log_level(), INFO)
+
+    @patch.dict(environ, {"OTEL_LOG_LEVEL": " warn"}, clear=True)
+    def test_otel_log_level_by_name_warn(self):
+        self.assertEqual(_get_log_level(), WARNING)
+
+    @patch.dict(environ, {"OTEL_LOG_LEVEL": " warnING "}, clear=True)
+    def test_otel_log_level_by_name_warning(self):
+        self.assertEqual(_get_log_level(), WARNING)
+
+    @patch.dict(environ, {"OTEL_LOG_LEVEL": " eRroR"}, clear=True)
+    def test_otel_log_level_by_name_error(self):
+        self.assertEqual(_get_log_level(), ERROR)
+
+    @patch.dict(environ, {"OTEL_LOG_LEVEL": "foobar"}, clear=True)
+    def test_otel_log_level_by_name_invalid(self):
+        self.assertEqual(_get_log_level(), NOTSET)
+
     @patch.dict(
         environ,
         {"OTEL_RESOURCE_ATTRIBUTES": "service.name=otlp-service"},