Merge lp:~canonical-platform-qa/ubuntu-system-tests/eoferror-on-config into lp:ubuntu-system-tests

[Allan LeSage]

Catch EOFError on no config input() for Jenkins, offer default.

Quickie change to support Jenkins having no config input.

Seeing this kind of thing with our config system:

The name of the country of the SIM card to use for telegram login (leave blank to use default value: United States): Traceback (most recent call last):
  File "/usr/lib/python3.4/runpy.py", line 170, in _run_module_as_main
    "__main__", mod_spec)
  File "/usr/lib/python3.4/runpy.py", line 85, in _run_code
    exec(code, run_globals)
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/command_line.py", line 699, in <module>
    sys.exit(main())
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/command_line.py", line 65, in main
    args.verbose)
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/command_line.py", line 137, in run_system_tests
    config_stack = _get_config_stack(conf_name, config_section, silent)
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/command_line.py", line 200, in _get_config_stack
    config_stack.get_missing_options(silent)
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/config/__init__.py", line 269, in get_missing_options
    self._get_option_value(option, silent)
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/config/__init__.py", line 299, in _get_option_value
    self._get_option_value_from_stdin(option)
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/config/__init__.py", line 307, in _get_option_value_from_stdin
    value = self._get_value_from_user_or_default(option)
  File "/var/lib/jenkins/slaves/krillin-06/workspace/ust_rc-proposed_krillin_sanity/ubuntu-system-tests/ubuntu_system_tests/config/__init__.py", line 326, in _get_value_from_user_or_default
    return input() or option.default

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:387
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/166/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/224
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/224/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/224
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/224/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/198/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/166/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

For Jenkins, the silent mode option should take care of this, so the default value is used instead of prompting for user input. Could you confirm you are using -s option for Jenkins?

review: Needs Information

Unmerged revisions

387. By Allan LeSage on 2016-05-17

Catch EOFError if no input() for config, offer default.

=== modified file 'ubuntu_system_tests/config/__init__.py'
--- ubuntu_system_tests/config/__init__.py	2016-05-06 10:18:32 +0000
+++ ubuntu_system_tests/config/__init__.py	2016-05-17 22:33:22 +0000
@@ -323,7 +323,11 @@
 
     def _get_value_from_user_or_default(self, option):
         """Return value from stdin or default value if no stdin value."""
-        return input() or option.default
+        try:
+            return input() or option.default
+        except EOFError:
+            # e.g. if no terminal (as in Jenkins)
+            return option.default
 
     def get_autopilot_config_string(self):
         """Return the configuration in a string usable by Autopilot.