Simplify the log grouping logic

unit_tests/test_logger_interface_grouping.py

@@ -78,8 +78,8 @@ class LoggerGroupingTests(unittest.TestCase):
         evaluator = smartcondition.Evaluator.__new__(smartcondition.Evaluator)
         evaluator._Evaluator__logger_interface = None
         evaluator._Evaluator__appdaemon_api = app
-        evaluator._Evaluator__trace_name = 'smart_conditions'
-        with evaluator._Evaluator__log_group():
+        evaluator._Evaluator__log_group = 'smart_conditions'
+        with evaluator._Evaluator__log_group_scope():
             app.log_info('Callback trigger by sensor.example(0 => 1)')
             app.log_info('[smart_conditions][Evaluating] Triggered by condition')
         marker_a = app.rows[0][1].split('[group=')[1].rstrip(']')
@@ -87,6 +87,19 @@ class LoggerGroupingTests(unittest.TestCase):
         self.assertEqual(marker_a, marker_b)
         self.assertTrue(marker_a.startswith('smartcondition:'))
 
+    def test_log_group_takes_priority_over_condition_name(self):
+        app = FakeApp()
+        evaluator = smartcondition.Evaluator(app, {}, activated=False,
+                                             condition_name='condition-a', log_group='group-a')
+        self.assertEqual(evaluator._Evaluator__log_group, 'group-a')
+        self.assertEqual(evaluator._Evaluator__log_to_string('message'), '[condition-a] message')
+        with evaluator._Evaluator__log_group_scope() as group:
+            self.assertEqual(group['label'], 'group-a')
+
+        fallback = smartcondition.Evaluator(app, {}, activated=False,
+                                            condition_name=['condition-a', 'condition-b'])
+        self.assertEqual(fallback._Evaluator__log_group, 'condition-a, condition-b')
+
     def test_nested_scopes_inherit_outer_group_and_reset_after_exception(self):
         app = FakeApp()
         with app.log_group('value_selector', 'sensor.a') as outer: