mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
a375dd7e1f
* salt/crypt.py: clean up open filehandles * salt/fileclient.py: clean up open filehandles * salt/grains/core.py: clean up open filehandles * salt/modules/cp.py: clean up open filehandles * salt/modules/data.py: clean up open filehandles * salt/modules/dnsutil.py: clean up open filehandles * salt/modules/dockerng.py: clean up open filehandles * salt/modules/inspectlib/collector.py: clean up open filehandles * salt/modules/file.py: clean up open filehandles * salt/modules/hosts.py: clean up open filehandles * salt/modules/incron.py: clean up open filehandles * salt/modules/dpkg.py: clean up open filehandles * salt/modules/linux_sysctl.py: clean up open filehandles * salt/modules/netbsd_sysctl.py: clean up open filehandles * salt/modules/network.py: clean up open filehandles * salt/modules/nftables.py: clean up open filehandles * salt/modules/openbsd_sysctl.py: clean up open filehandles * salt/modules/rh_ip.py: clean up open filehandles * salt/modules/portage_config.py: clean up open filehandles * salt/modules/status.py: clean up open filehandles * salt/modules/tls.py: clean up open filehandles * salt/modules/xapi.py: clean up open filehandles * salt/modules/x509.py: clean up open filehandles * salt/modules/virt.py: clean up open filehandles * salt/modules/zcbuildout.py: clean up open filehandles * salt/returners/local_cache.py: clean up open filehandles * salt/utils/cloud.py: clean up open filehandles * salt/states/pkgrepo.py: clean up open filehandles * salt/states/x509.py: clean up open filehandles * salt/transport/mixins/auth.py: clean up open filehandles * salt/utils/__init__.py: clean up open filehandles * salt/states/pkg.py: clean up open filehandles * salt/utils/minion.py: clean up open filehandles * salt/utils/openstack/nova.py: clean up open filehandles * salt/utils/openstack/swift.py: clean up open filehandles * salt/utils/process.py: clean up open filehandles * salt/utils/templates.py: clean up open filehandles * salt/utils/virt.py: clean up open filehandles * tests/integration/__init__.py: clean up open filehandles * tests/integration/cli/grains.py: clean up open filehandles * tests/integration/client/standard.py: clean up open filehandles * tests/integration/modules/hosts.py: clean up open filehandles * tests/unit/utils/vt_test.py: clean up open filehandles * tests/integration/shell/enabled.py: clean up open filehandles * tests/integration/states/cmd.py: clean up open filehandles * tests/integration/states/file.py: clean up open filehandles * tests/integration/states/match.py: clean up open filehandles * tests/unit/config_test.py: clean up open filehandles * tests/unit/templates/jinja_test.py: clean up open filehandles * tests/unit/utils/find_test.py: clean up open filehandles * tests/integration/modules/state.py: clean up open filehandles * Update dnsutil_test to reflect changes in fopen usage
221 lines
8.0 KiB
Python
221 lines
8.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
|
|
|
|
|
|
tests.unit.utils.vt_test
|
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
VirtualTerminal tests
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
import sys
|
|
import random
|
|
import subprocess
|
|
import time
|
|
|
|
# Import Salt Testing libs
|
|
from salttesting import TestCase, skipIf
|
|
from salttesting.helpers import ensure_in_syspath
|
|
ensure_in_syspath('../../')
|
|
|
|
# Import salt libs
|
|
import salt.utils
|
|
import salt.utils.vt
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
|
|
|
|
|
|
class VTTestCase(TestCase):
|
|
|
|
@skipIf(True, 'Disabled until we can figure out why this fails when whole test suite runs.')
|
|
def test_vt_size(self):
|
|
'''Confirm that the terminal size is being set'''
|
|
if not sys.stdin.isatty():
|
|
self.skipTest('Not attached to a TTY. The test would fail.')
|
|
cols = random.choice(range(80, 250))
|
|
terminal = salt.utils.vt.Terminal(
|
|
'echo "Foo!"',
|
|
shell=True,
|
|
cols=cols,
|
|
rows=24,
|
|
stream_stdout=False,
|
|
stream_stderr=False
|
|
)
|
|
# First the assertion
|
|
self.assertEqual(
|
|
terminal.getwinsize(), (24, cols)
|
|
)
|
|
# Then wait for the terminal child to exit
|
|
terminal.wait()
|
|
terminal.close()
|
|
|
|
@skipIf(True, 'Disabled until we can find out why this kills the tests suite with an exit code of 134')
|
|
def test_issue_10404_ptys_not_released(self):
|
|
n_executions = 15
|
|
|
|
def current_pty_count():
|
|
# Get current number of PTY's
|
|
try:
|
|
if os.path.exists('/proc/sys/kernel/pty/nr'):
|
|
with salt.utils.fopen('/proc/sys/kernel/pty/nr') as fh_:
|
|
return int(fh_.read().strip())
|
|
|
|
proc = subprocess.Popen(
|
|
'sysctl -a 2> /dev/null | grep pty.nr | awk \'{print $3}\'',
|
|
shell=True,
|
|
stdout=subprocess.PIPE
|
|
)
|
|
stdout, _ = proc.communicate()
|
|
return int(stdout.strip())
|
|
except (ValueError, OSError, IOError):
|
|
if salt.utils.is_darwin():
|
|
# We're unable to findout how many PTY's are open
|
|
self.skipTest(
|
|
'Unable to find out how many PTY\'s are open on Darwin - '
|
|
'Skipping for now'
|
|
)
|
|
self.fail('Unable to find out how many PTY\'s are open')
|
|
|
|
nr_ptys = current_pty_count()
|
|
|
|
# Using context manager's
|
|
for idx in range(0, nr_ptys + n_executions):
|
|
try:
|
|
with salt.utils.vt.Terminal('echo "Run {0}"'.format(idx),
|
|
shell=True,
|
|
stream_stdout=False,
|
|
stream_stderr=False) as terminal:
|
|
terminal.wait()
|
|
try:
|
|
if current_pty_count() > (nr_ptys + (n_executions/2)):
|
|
self.fail('VT is not cleaning up PTY\'s')
|
|
except (ValueError, OSError, IOError):
|
|
self.fail('Unable to find out how many PTY\'s are open')
|
|
except Exception as exc:
|
|
if 'out of pty devices' in exc:
|
|
# We're not cleaning up
|
|
raise
|
|
# We're pushing the system resources, let's keep going
|
|
continue
|
|
|
|
# Not using context manager's
|
|
for idx in range(0, nr_ptys + n_executions):
|
|
try:
|
|
terminal = salt.utils.vt.Terminal('echo "Run {0}"'.format(idx),
|
|
shell=True,
|
|
stream_stdout=False,
|
|
stream_stderr=False)
|
|
terminal.wait()
|
|
try:
|
|
if current_pty_count() > (nr_ptys + (n_executions/2)):
|
|
self.fail('VT is not cleaning up PTY\'s')
|
|
except (ValueError, OSError, IOError):
|
|
self.fail('Unable to find out how many PTY\'s are open')
|
|
except Exception as exc:
|
|
if 'out of pty devices' in exc:
|
|
# We're not cleaning up
|
|
raise
|
|
# We're pushing the system resources, let's keep going
|
|
continue
|
|
|
|
@skipIf(True, 'Disabled until we can figure out how to make this more reliable.')
|
|
def test_isalive_while_theres_data_to_read(self):
|
|
expected_data = 'Alive!\n'
|
|
term = salt.utils.vt.Terminal('echo "Alive!"',
|
|
shell=True,
|
|
stream_stdout=False,
|
|
stream_stderr=False)
|
|
buffer_o = buffer_e = ''
|
|
try:
|
|
while term.has_unread_data:
|
|
stdout, stderr = term.recv()
|
|
if stdout:
|
|
buffer_o += stdout
|
|
if stderr:
|
|
buffer_e += stderr
|
|
# While there's data to be read, the process is alive
|
|
if stdout is None and stderr is None:
|
|
self.assertFalse(term.isalive())
|
|
|
|
# term should be dead now
|
|
self.assertEqual(buffer_o, expected_data)
|
|
self.assertFalse(term.isalive())
|
|
|
|
stdout, stderr = term.recv()
|
|
self.assertFalse(term.isalive())
|
|
self.assertIsNone(stderr)
|
|
self.assertIsNone(stdout)
|
|
finally:
|
|
term.close(terminate=True, kill=True)
|
|
|
|
expected_data = 'Alive!\n'
|
|
term = salt.utils.vt.Terminal('echo "Alive!" 1>&2',
|
|
shell=True,
|
|
stream_stdout=False,
|
|
stream_stderr=False)
|
|
buffer_o = buffer_e = ''
|
|
try:
|
|
while term.has_unread_data:
|
|
stdout, stderr = term.recv()
|
|
if stdout:
|
|
buffer_o += stdout
|
|
if stderr:
|
|
buffer_e += stderr
|
|
# While there's data to be read, the process is alive
|
|
if stdout is None and stderr is None:
|
|
self.assertFalse(term.isalive())
|
|
|
|
# term should be dead now
|
|
self.assertEqual(buffer_e, expected_data)
|
|
self.assertFalse(term.isalive())
|
|
|
|
stdout, stderr = term.recv()
|
|
self.assertFalse(term.isalive())
|
|
self.assertIsNone(stderr)
|
|
self.assertIsNone(stdout)
|
|
finally:
|
|
term.close(terminate=True, kill=True)
|
|
|
|
expected_data = 'Alive!\nAlive!\n'
|
|
term = salt.utils.vt.Terminal('echo "Alive!"; sleep 5; echo "Alive!"',
|
|
shell=True,
|
|
stream_stdout=False,
|
|
stream_stderr=False)
|
|
buffer_o = buffer_e = ''
|
|
try:
|
|
while term.has_unread_data:
|
|
stdout, stderr = term.recv()
|
|
if stdout:
|
|
buffer_o += stdout
|
|
if stderr:
|
|
buffer_e += stderr
|
|
# While there's data to be read, the process is alive
|
|
if stdout is None and stderr is None:
|
|
self.assertFalse(term.isalive())
|
|
|
|
if buffer_o != expected_data:
|
|
self.assertTrue(term.isalive())
|
|
# Don't spin
|
|
time.sleep(0.1)
|
|
|
|
# term should be dead now
|
|
self.assertEqual(buffer_o, expected_data)
|
|
self.assertFalse(term.isalive())
|
|
|
|
stdout, stderr = term.recv()
|
|
self.assertFalse(term.isalive())
|
|
self.assertIsNone(stderr)
|
|
self.assertIsNone(stdout)
|
|
finally:
|
|
term.close(terminate=True, kill=True)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
from integration import run_tests
|
|
run_tests(VTTestCase, needs_daemon=False)
|