From fbaf48d54106c7b4cf4aa7b316721ecba22f4b83 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh <567675+ajkavanagh@users.noreply.github.com> Date: Fri, 11 Sep 2020 15:27:15 +0100 Subject: [PATCH] More fixes for series-upgrade (#413) --- zaza/openstack/charm_tests/series_upgrade/tests.py | 4 ++-- zaza/openstack/utilities/cli.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/series_upgrade/tests.py b/zaza/openstack/charm_tests/series_upgrade/tests.py index c595448..122af11 100644 --- a/zaza/openstack/charm_tests/series_upgrade/tests.py +++ b/zaza/openstack/charm_tests/series_upgrade/tests.py @@ -81,7 +81,7 @@ class SeriesUpgradeTest(unittest.TestCase): logging.info( "Running complete-cluster-series-upgrade action on leader") model.run_action_on_leader( - charm_name, + application, 'complete-cluster-series-upgrade', action_params={}) model.block_until_all_units_idle() @@ -90,7 +90,7 @@ class SeriesUpgradeTest(unittest.TestCase): logging.info( "Running complete-cluster-series-upgrade action on leader") model.run_action_on_leader( - charm_name, + application, 'complete-cluster-series-upgrade', action_params={}) model.block_until_all_units_idle() diff --git a/zaza/openstack/utilities/cli.py b/zaza/openstack/utilities/cli.py index 68a659f..f8071be 100644 --- a/zaza/openstack/utilities/cli.py +++ b/zaza/openstack/utilities/cli.py @@ -16,6 +16,7 @@ import logging import os +import sys def parse_arg(options, arg, multiargs=False): @@ -51,6 +52,6 @@ def setup_logging(): rootLogger = logging.getLogger() rootLogger.setLevel('INFO') if not rootLogger.hasHandlers(): - consoleHandler = logging.StreamHandler() + consoleHandler = logging.StreamHandler(sys.stdout) consoleHandler.setFormatter(logFormatter) rootLogger.addHandler(consoleHandler)