saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed the unicode and timing inotify test issues.

Browse source
This commit is contained in:
Dmitry Kuzmenko 2019-08-18 01:41:48 +03:00
parent f17bcf3afe
commit 0bcf53c23e
No known key found for this signature in database
GPG key ID: 4C7CAD30C95651DA
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tests/multimaster/beacons/test_inotify.py
View file

@ -29,7 +29,7 @@ class TestBeaconsInotify(MultimasterModuleCase, AdaptedConfigurationTestCaseMixi
Validate the inotify beacon in multimaster environment
'''
def setUp(self):
self.tmpdir = tempfile.mkdtemp()
self.tmpdir = salt.utils.stringutils.to_unicode(tempfile.mkdtemp())
def tearDown(self):
shutil.rmtree(self.tmpdir, ignore_errors=True)
@ -42,6 +42,24 @@ class TestBeaconsInotify(MultimasterModuleCase, AdaptedConfigurationTestCaseMixi
)
self.assertTrue(res.get('result'))
# Ensure the beacon is added just for better diagnostic.
res = self.run_function(
'beacons.list',
(),
return_yaml=False,
master_tgt=0,
)
self.assertEqual({
'inotify': [{
'files': {
self.tmpdir: {
'mask': ['create']
}
}
}]
}
, res)
file_path = os.path.join(self.tmpdir, 'tmpfile')
try:
master_listener = salt.utils.event.get_event(
@ -56,14 +74,15 @@ class TestBeaconsInotify(MultimasterModuleCase, AdaptedConfigurationTestCaseMixi
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)
# Waiting for 1 loop interval + some seconds to the hardware stupidity
time.sleep(self.mm_minion_opts['loop_interval'] + 6)
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
# Waiting for 2 loops intervals + some seconds to the hardware stupidity.
stop_at = start + self.mm_minion_opts['loop_interval'] * 2 + 30
event = sub_event = None
while True:
if time.time() > stop_at:
@ -105,8 +124,8 @@ class TestBeaconsInotify(MultimasterModuleCase, AdaptedConfigurationTestCaseMixi
'change': 'IN_CREATE',
'id': 'minion',
},
'tag': 'salt/beacon/minion/inotify/' + self.tmpdir,
'tag': salt.utils.stringutils.to_str('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))
self.assertEqual((expected, expected), (event, sub_event))