diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/installer/apex.py | 6 | ||||
| -rw-r--r-- | tests/logger.py | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/installer/apex.py b/tests/installer/apex.py index 24cd5a75..e0960a5f 100644 --- a/tests/installer/apex.py +++ b/tests/installer/apex.py @@ -13,8 +13,6 @@ import pwd import stat import sys -from installer.common.congress import set_doctor_driver_conf -from installer.common.congress import restore_doctor_driver_conf from installer.base import BaseInstaller from utils import SSHClient @@ -74,16 +72,12 @@ class ApexInstaller(BaseInstaller): client = SSHClient(node_ip, self.node_user_name, key_filename=self.key_file) self.controller_clients.append(client) self._ceilometer_apply_patches(client, self.cm_set_script) - cmd = 'sudo systemctl restart openstack-congress-server.service' - set_doctor_driver_conf(client, cmd) def restore_apply_patches(self): self.log.info('restore apply patches start......') for client in self.controller_clients: self._ceilometer_apply_patches(client, self.cm_restore_script) - cmd = 'sudo systemctl restart openstack-congress-server.service' - restore_doctor_driver_conf(client, cmd) def _ceilometer_apply_patches(self, ssh_client, script_name): installer_dir = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/logger.py b/tests/logger.py index 021389d9..80d19bb9 100644 --- a/tests/logger.py +++ b/tests/logger.py @@ -21,7 +21,8 @@ class Logger(object): CI_DEBUG = os.getenv('CI_DEBUG') - logging.basicConfig(filemode='w') + filename = '%s.log' % logger_name + logging.basicConfig(filemode='w', filename=filename) self.logger = logging.getLogger(logger_name) self.logger.propagate = 0 self.logger.setLevel(logging.DEBUG) @@ -37,7 +38,7 @@ class Logger(object): ch.setLevel(logging.INFO) self.logger.addHandler(ch) - file_handler = logging.FileHandler('%s.log' % logger_name) + file_handler = logging.FileHandler(filename) file_handler.setFormatter(formatter) file_handler.setLevel(logging.DEBUG) self.logger.addHandler(file_handler) |