Add a test against infinite prompt during cluster setup

cli/dcoscli/node/main.py

@@ -372,7 +372,7 @@ def _bundle_download(bundle, location):
         msg = ('Diagnostics bundle size is {}, '
                'are you sure you want to download it?')
         if not confirm(msg.format(sizeof_fmt(bundle_size)), False):
-            return 0
+            return 1
 
     r = _do_request(url, 'GET', stream=True)
     try:

cli/dcoscli/package/main.py

@@ -351,7 +351,7 @@ def _install(package_name, package_version, options_path, app_id, cli,
 
     if not confirm('Continue installing?', yes):
         emitter.publish('Exiting installation.')
-        return 0
+        return 1
 
     if app and pkg.marathon_template():
 

cli/tests/integrations/helpers/common.py

@@ -12,7 +12,7 @@
 from dcos import config, http
 
 
-def exec_command(cmd, env=None, stdin=None):
+def exec_command(cmd, env=None, stdin=None, timeout=None):
     """Execute CLI command
 
     :param cmd: Program and arguments
@@ -21,6 +21,10 @@ def exec_command(cmd, env=None, stdin=None):
     :type env: dict | None
     :param stdin: File to use for stdin
     :type stdin: file
+    :param timeout: If the process doesn't terminate after this timeout,
+                    it will get killed and a subprocess.TimeoutExpired
+                    exception will be raised. The timeout is in seconds.
+    :type timeout: int
     :returns: A tuple with the returncode, stdout and stderr
     :rtype: (int, bytes, bytes)
     """
@@ -34,9 +38,19 @@ def exec_command(cmd, env=None, stdin=None):
         stderr=subprocess.PIPE,
         env=env)
 
+    try:
+        streams = process.communicate(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        # The child process is not killed if the timeout expires, so in order
+        # to cleanup properly a well-behaved application should kill the child
+        # process and finish communication.
+        # https://docs.python.org/3.5/library/subprocess.html#subprocess.Popen.communicate
+        process.kill()
+        process.communicate()
+        raise
+
     # This is needed to get rid of '\r' from Windows's lines endings.
-    stdout, stderr = [std_stream.replace(b'\r', b'')
-                      for std_stream in process.communicate()]
+    stdout, stderr = [stream.replace(b'\r', b'') for stream in streams]
 
     # We should always print the stdout and stderr
     print('STDOUT: {}'.format(_truncate(stdout.decode('utf-8'))))

cli/tests/integrations/test_cluster.py

@@ -1,4 +1,5 @@
 import json
+import subprocess
 
 from .helpers.common import assert_command, exec_command
 
@@ -43,3 +44,24 @@ def test_rename():
 
     # rename back to original name
     assert_command(['dcos', 'cluster', 'rename', new_name, name])
+
+
+def test_setup_noninteractive():
+    """
+    Run "dcos cluster setup" command as non-interactive with a 30 sec timeout.
+    This makes sure the process doesn't prompt for input forever (DCOS-15590).
+    """
+
+    try:
+        returncode, stdout, _ = exec_command(
+            ['dcos',
+             'cluster',
+             'setup',
+             'https://dcos.snakeoil.mesosphere.com'],
+            timeout=30,
+            stdin=subprocess.DEVNULL)
+    except subprocess.TimeoutExpired:
+        assert False, 'timed out waiting for process to exit'
+
+    assert returncode == 1
+    assert b"'' is not a valid response" in stdout

cli/tests/integrations/test_package.py

@@ -2,6 +2,7 @@
 import contextlib
 import json
 import os
+import subprocess
 import sys
 
 import pytest
@@ -416,6 +417,19 @@ def test_install_bad_package_version():
         stderr=stderr)
 
 
+def test_install_noninteractive():
+    try:
+        returncode, stdout, _ = exec_command(
+            ['dcos', 'package', 'install', 'hello-world'],
+            timeout=30,
+            stdin=subprocess.DEVNULL)
+    except subprocess.TimeoutExpired:
+        assert False, 'timed out waiting for process to exit'
+
+    assert returncode == 1
+    assert b"'' is not a valid response" in stdout
+
+
 def test_package_metadata():
     _install_helloworld()
 
@@ -683,7 +697,8 @@ def test_install_no():
                 b'catalog-terms-conditions/#community-services\n'
                 b'A sample pre-installation message\n'
                 b'Continue installing? [yes/no] Exiting installation.\n'
-            )
+            ),
+            returncode=1
         )