Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: fix qvm-run test on travis

Browse Source 
stdout there is not a tty, which change default value of filter_esc.
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-25 13:34:06 +02:00
parent 3cf5840d7a
commit c545c95660
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qubesadmin/tests/tools/qvm_run.py
View File

@ -19,6 +19,7 @@
# with this program; if not, see <http://www.gnu.org/licenses/>. # with this program; if not, see <http://www.gnu.org/licenses/>.
import io import io
import os
import unittest.mock import unittest.mock
import subprocess import subprocess
@ -34,6 +35,10 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
sys.stderr is not sys.__stderr__: sys.stderr is not sys.__stderr__:
self.skipTest('qvm-run change behavior on redirected stdout/stderr') self.skipTest('qvm-run change behavior on redirected stdout/stderr')
super(TC_00_qvm_run, self).setUp() super(TC_00_qvm_run, self).setUp()
def default_filter_esc(self):
return os.isatty(sys.stdout.fileno())
def test_000_run_single(self): def test_000_run_single(self):
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'admin.vm.List', None, None)] = \ ('dom0', 'admin.vm.List', None, None)] = \
@ -47,7 +52,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': None, 'localcmd': None,
'stdout': subprocess.DEVNULL, 'stdout': subprocess.DEVNULL,
'stderr': subprocess.DEVNULL, 'stderr': subprocess.DEVNULL,
@ -71,7 +76,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': None, 'localcmd': None,
'stdout': subprocess.DEVNULL, 'stdout': subprocess.DEVNULL,
'stderr': subprocess.DEVNULL, 'stderr': subprocess.DEVNULL,
@ -79,7 +84,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
}), }),
('test-vm', 'qubes.VMShell', b'command; exit\n'), ('test-vm', 'qubes.VMShell', b'command; exit\n'),
('test-vm2', 'qubes.VMShell', { ('test-vm2', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': None, 'localcmd': None,
'stdout': subprocess.DEVNULL, 'stdout': subprocess.DEVNULL,
'stderr': subprocess.DEVNULL, 'stderr': subprocess.DEVNULL,
@ -105,7 +110,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': None, 'localcmd': None,
'stdout': None, 'stdout': None,
'stderr': None, 'stderr': None,
@ -127,7 +132,8 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
with unittest.mock.patch('sys.stdin', echo.stdout): with unittest.mock.patch('sys.stdin', echo.stdout):
with unittest.mock.patch('sys.stdout', stdout): with unittest.mock.patch('sys.stdout', stdout):
ret = qubesadmin.tools.qvm_run.main( ret = qubesadmin.tools.qvm_run.main(
['--no-gui', '--pass-io', 'test-vm', 'command'], ['--no-gui', '--filter-esc', '--pass-io', 'test-vm',
'command'],
app=self.app) app=self.app)
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
@ -164,7 +170,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': None, 'localcmd': None,
'stdout': None, 'stdout': None,
'stderr': None, 'stderr': None,
@ -221,7 +227,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': 'local-command', 'localcmd': 'local-command',
'stdout': None, 'stdout': None,
'stderr': None, 'stderr': None,
@ -253,7 +259,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
}), }),
('test-vm', 'qubes.WaitForSession', b'user'), ('test-vm', 'qubes.WaitForSession', b'user'),
('test-vm', 'qubes.VMShell', { ('test-vm', 'qubes.VMShell', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': None, 'localcmd': None,
'stdout': subprocess.DEVNULL, 'stdout': subprocess.DEVNULL,
'stderr': subprocess.DEVNULL, 'stderr': subprocess.DEVNULL,
@ -285,7 +291,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
}), }),
('test-vm', 'qubes.WaitForSession', b'user'), ('test-vm', 'qubes.WaitForSession', b'user'),
('test-vm', 'service.name', { ('test-vm', 'service.name', {
'filter_esc': True, 'filter_esc': self.default_filter_esc(),
'localcmd': None, 'localcmd': None,
'stdout': subprocess.DEVNULL, 'stdout': subprocess.DEVNULL,
'stderr': subprocess.DEVNULL, 'stderr': subprocess.DEVNULL,