openstack/deb-python-dcos
Code Issues Proposed changes

test cleanup (#713)

Browse Source
This commit is contained in:
tamarrow
2016-08-11 18:39:34 -07:00
committed by GitHub
parent 0c2d9d4216
commit 46252d0c77
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/tests/integrations/test_node.py
View File

@@ -176,12 +176,16 @@ def test_slave_arg_deprecation_notice():
returncode=1)
@pytest.mark.skipif(sys.platform == 'win32',
reason='No pseudo terminal on windows')
def test_node_ssh_with_command():
leader_hostname = mesos.DCOSClient().get_state_summary()['hostname']
_node_ssh(['--leader', '--master-proxy', '/opt/mesosphere/bin/detect_ip'],
0, leader_hostname)
@pytest.mark.skipif(sys.platform == 'win32',
reason='No pseudo terminal on windows')
def test_node_ssh_slave_with_command():
slave = mesos.DCOSClient().get_state_summary()['slaves'][0]
_node_ssh(['--mesos-id={}'.format(slave['id']), '--master-proxy',

30
cli/tests/integrations/test_package.py
View File

@@ -573,25 +573,17 @@ def test_uninstall_multiple_apps():
stdout = (b'A sample pre-installation message\n'
b'Installing Marathon app for package [helloworld] version '
b'[0.1.0] with app id [/helloworld-1]\n'
b'Installing CLI subcommand for package [helloworld] '
b'version [0.1.0]\n'
b'New command available: dcos ' +
_executable_name(b'helloworld') +
b'\nA sample post-installation message\n')
b'A sample post-installation message\n')
_install_helloworld(['--yes', '--app-id=/helloworld-1'],
_install_helloworld(['--yes', '--app-id=/helloworld-1', '--app'],
stdout=stdout)
stdout = (b'A sample pre-installation message\n'
b'Installing Marathon app for package [helloworld] version '
b'[0.1.0] with app id [/helloworld-2]\n'
b'Installing CLI subcommand for package [helloworld] '
b'version [0.1.0]\n'
b'New command available: dcos ' +
_executable_name(b'helloworld') +
b'\nA sample post-installation message\n')
b'A sample post-installation message\n')
_install_helloworld(['--yes', '--app-id=/helloworld-2'],
_install_helloworld(['--yes', '--app-id=/helloworld-2', '--app'],
stdout=stdout)
stderr = (b"Multiple apps named [helloworld] are installed: "
@@ -932,13 +924,13 @@ def _chronos_package(
stdin=None):
_install_chronos(
args,
returncode,
stdout,
stderr,
preInstallNotes,
postInstallNotes,
stdin)
args,
returncode,
stdout,
stderr,
preInstallNotes,
postInstallNotes,
stdin)
try:
yield
finally: