Merge f137fd8 into 66f4217

Alignak-monitoring · Aug 28, 2017 · 4fe043c · 4fe043c
2 parents 66f4217 + f137fd8
commit 4fe043c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/alignak/objects/schedulingitem.py b/alignak/objects/schedulingitem.py
@@ -157,7 +157,7 @@ class SchedulingItem(Item):  # pylint: disable=R0902
         'notifications_enabled':
             BoolProp(default=True, fill_brok=['full_status'], retention=True),
         'stalking_options':
-            ListProp(default=[''], fill_brok=['full_status'], merging='join'),
+            ListProp(default=[], fill_brok=['full_status'], merging='join'),
         'notes':
             StringProp(default='', fill_brok=['full_status']),
         'notes_url':

diff --git a/test/test_properties_default.py b/test/test_properties_default.py
@@ -556,7 +556,7 @@ class TestHost(PropertiesTester, AlignakTest):
         ('first_notification_delay', 0),
         ('notification_options', ['d','x','r','f']),
         ('notifications_enabled', True),
-        ('stalking_options', ['']),
+        ('stalking_options', []),
         ('notes', ''),
         ('notes_url', ''),
         ('action_url', ''),
@@ -874,7 +874,7 @@ class TestService(PropertiesTester, AlignakTest):
         ('notifications_enabled', True),
         ('contacts', []),
         ('contact_groups', []),
-        ('stalking_options', ['']),
+        ('stalking_options', []),
         ('notes', ''),
         ('notes_url', ''),
         ('action_url', ''),