Merge lp:~canonical-platform-qa/ubuntu-system-tests/add-setup-silent-option into lp:ubuntu-system-tests

[Richard Huddie]

Add silent option to setup command.

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

FAILED: Continuous integration, rev:411
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/274/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/431/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/431/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/372/console

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

review: Needs Fixing (continuous-integration)

[Max Brustkern (nuclearbob)]

LGTM, but I suppose we should see what the bot doesn't like.

review: Approve

[lp:~canonical-platform-qa/ubuntu-system-tests/add-setup-silent-option]

412. By Richard Huddie on 2016-06-30

Fix selftests.

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

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

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

review: Approve (continuous-integration)

=== modified file 'ubuntu_system_tests/host/command_line.py'
--- ubuntu_system_tests/host/command_line.py	2016-06-29 08:05:47 +0000
+++ ubuntu_system_tests/host/command_line.py	2016-06-30 18:29:08 +0000
@@ -103,9 +103,9 @@
     OPTION_CONFIG,
     OPTION_CONFIG_SECTION,
     OPTION_NETWORK_READY,
+    OPTION_SILENT,
     OPTION_VERBOSE]
 RUN_ARGS = [
-    OPTION_SILENT,
     OPTION_SUITES,
     OPTION_TOUCH_VISUALIZATION]
 SETUP_ARGS = [

=== modified file 'ubuntu_system_tests/selftests/test_command_line.py'
--- ubuntu_system_tests/selftests/test_command_line.py	2016-06-24 13:33:28 +0000
+++ ubuntu_system_tests/selftests/test_command_line.py	2016-06-30 18:29:08 +0000
@@ -98,6 +98,8 @@
     DONT_INSTALL_TESTS = False
     DO_USE_CACHE_DEPS = True
     DONT_USE_CACHE_DEPS = False
+    DO_USE_SILENT_MODE = True
+    DONT_USE_SILENT_MODE = False
     DO_USE_VERBOSE_LOGGING = True
     DONT_USE_VERBOSE_LOGGING = False
 
@@ -114,6 +116,7 @@
                 DO_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('alternative config', {
@@ -128,6 +131,7 @@
                 DO_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('alternative config section', {
@@ -142,6 +146,7 @@
                 DO_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('only apt-get update', {
@@ -156,6 +161,7 @@
                 DONT_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('with network already setup', {
@@ -170,6 +176,7 @@
                 DO_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('with dist-upgrade enabled', {
@@ -184,6 +191,7 @@
                 DO_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('with install dependencies enabled', {
@@ -198,6 +206,7 @@
                 DONT_DIST_UPGRADE,
                 DO_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('with cache deps specified', {
@@ -212,6 +221,7 @@
                 DONT_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
         ('with verbose logging specified', {
@@ -226,6 +236,7 @@
                 DO_DIST_UPGRADE,
                 DONT_INSTALL_TESTS,
                 DO_APT_UPDATE,
+                DONT_USE_SILENT_MODE,
             )
         }),
     ]

=== modified file 'ubuntu_system_tests/selftests/utils.py'
--- ubuntu_system_tests/selftests/utils.py	2016-06-23 15:30:13 +0000
+++ ubuntu_system_tests/selftests/utils.py	2016-06-30 18:29:08 +0000
@@ -75,12 +75,12 @@
         command='setup', config=config.DEFAULT_CONF,
         config_section=config.KEY_DEFAULT, network_ready=False, verbose=False,
         cache_deps=False, dist_upgrade=False, install_tests=False,
-        update_apt=False):
+        update_apt=False, silent=False):
     return Namespace(
         command=command, config=config, config_section=config_section,
         network_ready=network_ready, verbose=verbose, cache_deps=cache_deps,
         dist_upgrade=dist_upgrade, install_tests=install_tests,
-        update_apt=update_apt)
+        update_apt=update_apt, silent=silent)
 
 
 def set_uniq_cwd(test, prefix=None):