Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove base_top_file file in teardown and add sleep #48899

Merged
merged 2 commits into from Aug 5, 2018
Merged

remove base_top_file file in teardown and add sleep #48899

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5896c7f
remove base_top_file file in teardown and add sleep
Ch3LL Aug 2, 2018
0272cad
Merge branch '2018.3' into unit_state
Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/unit/modules/test_state.py
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@
import shutil
import tempfile
import textwrap
import time

# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
Expand Down Expand Up @@ -1312,6 +1313,10 @@ def setUp(self):
- {saltenv}_{env_name}
'''.format(env_name=env_name, saltenv=saltenv)))

def tearDown(self):
time.sleep(1)
os.remove(self.base_top_file)

def show_top(self, **kwargs):
local_opts = copy.deepcopy(self.dunder_opts)
local_opts.update(kwargs)
Expand All @@ -1334,6 +1339,7 @@ def use_limited_base_top_file(self):
'*':
- base_base
'''))
time.sleep(1)

def test_merge_strategy_merge(self):
'''
Expand Down