Multimaster inotify beacons test

tests/multimaster/beacons/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

tests/multimaster/beacons/test_inotify.py

@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+# Import Python libs
+from __future__ import absolute_import, print_function, unicode_literals
+
+import time
+import tempfile
+import shutil
+import os
+try:
+    import pyinotify  # pylint: disable=unused-import
+    HAS_PYINOTIFY = True
+except ImportError:
+    HAS_PYINOTIFY = False
+
+# Import Salt Testing libs
+from tests.support.case import MultimasterModuleCase
+from tests.support.mixins import AdaptedConfigurationTestCaseMixin
+from tests.support.unit import skipIf
+
+# Import salt libs
+import salt.version
+import salt.config
+
+
+@skipIf(not HAS_PYINOTIFY, 'pyinotify is not available')
+class TestBeaconsInotify(MultimasterModuleCase, AdaptedConfigurationTestCaseMixin):
+    '''
+    Validate the inotify beacon in multimaster environment
+    '''
+    def setUp(self):
+        self.tmpdir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.tmpdir, ignore_errors=True)
+
+    def test_beacons_duplicate_53344(self):
+        res = self.run_function(
+                'beacons.add',
+                ('inotify', [{'files': {self.tmpdir: {'mask': ['create']}}}]),
+                master_tgt=0,
+                )
+        self.assertTrue(res.get('result'))
+
+        file_path = os.path.join(self.tmpdir, 'tmpfile')
+        try:
+            master_listener = salt.utils.event.get_event(
+                    'master',
+                    sock_dir=self.mm_master_opts['sock_dir'],
+                    transport=self.mm_master_opts['transport'],
+                    opts=self.mm_master_opts)
+            sub_master_listener = salt.utils.event.get_event(
+                    'master',
+                    sock_dir=self.mm_sub_master_opts['sock_dir'],
+                    transport=self.mm_sub_master_opts['transport'],
+                    opts=self.mm_sub_master_opts)
+
+            # We have to wait beacon first execution that would configure the inotify watch.
+            time.sleep(self.mm_minion_opts['loop_interval'] + 4)
+            with salt.utils.files.fopen(file_path, 'w') as f:
+                pass
+
+            start = time.time()
+            # Now in successful case this test will get results at most in 2 loop intervals.
+            # But we're adding a couple of seconds to be sure.
+            stop_at = start + self.mm_minion_opts['loop_interval'] * 2 + 3
+            event = sub_event = None
+            while True:
+                if time.time() > stop_at:
+                    break
+                if not event:
+                    event = master_listener.get_event(
+                            full=True,
+                            no_block=True,
+                            tag='salt/beacon/minion/inotify/' + self.tmpdir,
+                            match_type='startswith',
+                            )
+                if sub_event is None:
+                    sub_event = master_listener.get_event(
+                            full=True,
+                            no_block=True,
+                            tag='salt/beacon/minion/inotify/' + self.tmpdir,
+                            match_type='startswith',
+                            )
+                if not event or not sub_event:
+                    time.sleep(1)
+                if event and sub_event:
+                    break
+        finally:
+            self.assertTrue(self.run_function(
+                'beacons.delete',
+                ('inotify',),
+                master_tgt=0,
+                ))
+
+        # We can't determine the timestamp so remove it from results
+        if event:
+            del event['data']['_stamp']
+        if sub_event:
+            del sub_event['data']['_stamp']
+
+        expected = {
+                'data': {
+                    'path': file_path,
+                    'change': 'IN_CREATE',
+                    'id': 'minion',
+                    },
+                'tag': 'salt/beacon/minion/inotify/' + self.tmpdir,
+                }
+
+        # It's better to compare both at once to see both responses in the error log.
+        self.assertEqual((event, sub_event), (expected, expected))

tests/support/mixins.py

@@ -219,6 +219,27 @@ class AdaptedConfigurationTestCaseMixin(object):
         '''
         return self.get_config('sub_minion')
 
+    @property
+    def mm_master_opts(self):
+        '''
+        Return the options used for the multimaster master
+        '''
+        return self.get_config('mm_master')
+
+    @property
+    def mm_sub_master_opts(self):
+        '''
+        Return the options used for the multimaster sub-master
+        '''
+        return self.get_config('mm_sub_master')
+
+    @property
+    def mm_minion_opts(self):
+        '''
+        Return the options used for the minion
+        '''
+        return self.get_config('mm_minion')
+
 
 class SaltClientTestCaseMixin(AdaptedConfigurationTestCaseMixin):
     '''