diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-12 10:02:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-12 10:02:09 +0100 |
| commit | a0b261db8c030813e30a39eae47359ac2a37f7e2 (patch) | |
| tree | 7539d891d99da4ce3f5bf814251a3e39e41f9b51 /tests/vm/basevm.py | |
| parent | bac960832015bf4c4c1b873011612e2675e4464c (diff) | |
| parent | 1a6d3757107181dc0b9baf3dd8ff40fb2a242b66 (diff) | |
| download | focaccia-qemu-a0b261db8c030813e30a39eae47359ac2a37f7e2.tar.gz focaccia-qemu-a0b261db8c030813e30a39eae47359ac2a37f7e2.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2017-10-11 # gpg: Signature made Wed 11 Oct 2017 19:49:40 BST # gpg: using RSA key 0x2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: scripts: Remove debug parameter from QEMUMachine scripts: Remove debug parameter from QEMUMonitorProtocol guestperf: Configure logging on all shell frontends basevm: Call logging.basicConfig() iotests: Set up Python logging Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/vm/basevm.py')
| -rwxr-xr-x | tests/vm/basevm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 3c863bc237..686d88decf 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -227,8 +227,8 @@ def main(vmcls): if not argv and not args.build_qemu and not args.build_image: print "Nothing to do?" return 1 - if args.debug: - logging.getLogger().setLevel(logging.DEBUG) + logging.basicConfig(level=(logging.DEBUG if args.debug + else logging.WARN)) vm = vmcls(debug=args.debug, vcpus=args.jobs) if args.build_image: if os.path.exists(args.image) and not args.force: |