diff --git a/avocado/plugins/runner.py b/avocado/plugins/runner.py index 502ef4d028bce02a28f0890d0c05549fdd39a337..a229e03a76779f90b438fa53fecc7800ad1ad077 100644 --- a/avocado/plugins/runner.py +++ b/avocado/plugins/runner.py @@ -114,6 +114,9 @@ class TestRunner(plugin.Plugin): help=('Unique Job id. Used by a server when job ' 'was created at the server and run on a ' 'different test machine')) + + self.parser.add_argument('-s', '--silent', action='store_true', default=False, + help='Silent output, do not display results.') super(TestRunner, self).configure(self.parser) def run(self, args): diff --git a/avocado/plugins/silentresult.py b/avocado/plugins/silentresult.py deleted file mode 100644 index d9d47db6c8b9fa00a4639564f39271da6139eec0..0000000000000000000000000000000000000000 --- a/avocado/plugins/silentresult.py +++ /dev/null @@ -1,35 +0,0 @@ -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# See LICENSE for more details. -# -# Copyright: Red Hat Inc. 2014 -# Author: Ruda Moura - -""" -Silent output module. -""" - -from avocado.plugins import plugin - - -class Silent(plugin.Plugin): - - """ - Silent output plugin. - """ - - name = 'silent_output' - enabled = True - - def configure(self, parser): - self.parser = parser.application.add_argument( - '--silent', action='store_true', default=False, - help='Silent output, do not display results.') - self.configured = True diff --git a/selftests/all/functional/avocado/basic_tests.py b/selftests/all/functional/avocado/basic_tests.py index da92ea2f231678232dc98f826973ff5e07d26a3b..c24ab186924bc2e146821e8b57774038f0ddfaa5 100644 --- a/selftests/all/functional/avocado/basic_tests.py +++ b/selftests/all/functional/avocado/basic_tests.py @@ -150,7 +150,7 @@ class RunnerOperationTest(unittest.TestCase): def test_silent_output(self): os.chdir(basedir) - cmd_line = './scripts/avocado --silent run sleeptest' + cmd_line = './scripts/avocado run --silent sleeptest' result = process.run(cmd_line, ignore_status=True) expected_rc = 0 expected_output = ''