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

Merge pull request #39303 from kstreee/fix-testcase-rm-batch-in-netapi

Browse source 
Removes a redundant test case after removed 'batch' in 'netapi'.
This commit is contained in:
Mike Place 2017-02-13 12:55:46 -07:00 • committed by GitHub
commit 03ab8b1b5a
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/unit/netapi/rest_tornado/test_utils.py
View file

@ -6,7 +6,6 @@ import os
# Import Salt Testing Libs
from salttesting.unit import skipIf
from salttesting.case import TestCase
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../..')
@ -37,17 +36,6 @@ except ImportError:
from unit.utils.event_test import eventpublisher_process, event, SOCK_DIR # pylint: disable=import-error
@skipIf(HAS_TORNADO is False, 'The tornado package needs to be installed')
class TestUtils(TestCase):
def test_batching(self):
self.assertEqual(1, saltnado.get_batch_size('1', 10))
self.assertEqual(2, saltnado.get_batch_size('2', 10))
self.assertEqual(1, saltnado.get_batch_size('10%', 10))
# TODO: exception in this case? The core doesn't so we shouldn't
self.assertEqual(11, saltnado.get_batch_size('110%', 10))
@skipIf(HAS_TORNADO is False, 'The tornado package needs to be installed')
class TestSaltnadoUtils(AsyncTestCase):
def test_any_future(self):
@ -153,7 +141,3 @@ class TestEventListener(AsyncTestCase):
self.assertTrue(event_future.done())
with self.assertRaises(saltnado.TimeoutException):
event_future.result()
if __name__ == '__main__':
from integration import run_tests # pylint: disable=import-error
run_tests(TestUtils, needs_daemon=False)