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

Misplaced test. Use tests.support.unit instead.

Browse source
This commit is contained in:
Pedro Algarvio 2017-03-31 18:58:43 +01:00
parent f8d7530a58
commit 4f068f5217
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/utils/test_timeout.py → tests/unit/utils/test_timeout.py
View file

@ -1,10 +1,14 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
import unittest
import logging
# Import python libs
from __future__ import absolute_import
import logging
import time
# Import test libs
from tests.support.unit import TestCase
# Import Salt libs
from salt.utils.timeout import wait_for
log = logging.getLogger(__name__)
@ -53,11 +57,15 @@ def return_kwargs_after(seconds):
return actual
class WaitForTests(unittest.TestCase):
class WaitForTests(TestCase):
def setUp(self):
self.true_after_1s = return_something_after(1)
self.self_after_1s = return_something_after(1, something=self)
def tearDown(self):
del self.true_after_1s
del self.self_after_1s
def test_wait_for_true(self):
ret = wait_for(self.true_after_1s, timeout=2, step=0.5)
self.assertTrue(ret)
@ -89,7 +97,3 @@ class WaitForTests(unittest.TestCase):
def test_return_false(self):
ret = self.true_after_1s()
self.assertFalse(ret)
if __name__ == '__main__':
unittest.main()