Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: tests: create proper loggers
......................................................................
tests: create proper loggers
Introduce a base logger for conftool.tests
Change EtcdProcessHelper logger to be a class attribute (self.log) and
set a fully qualified name on __init__.
Tweak some debug message related to `etcd` starting.
Previously, the logger would complain there is no handler configured for
'conftool'.
Change-Id: I8351ddc92ef05f23ba9ae282c150eea07b008be4
---
M conftool/tests/__init__.py
M conftool/tests/integration/__init__.py
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/conftool/tests/__init__.py b/conftool/tests/__init__.py
index e69de29..ad5ec1d 100644
--- a/conftool/tests/__init__.py
+++ b/conftool/tests/__init__.py
@@ -0,0 +1,2 @@
+import logging
+logging.basicConfig(level=logging.DEBUG, name=__name__)
diff --git a/conftool/tests/integration/__init__.py
b/conftool/tests/integration/__init__.py
index 19db9c6..71592cf 100644
--- a/conftool/tests/integration/__init__.py
+++ b/conftool/tests/integration/__init__.py
@@ -22,7 +22,7 @@
cluster=False,
tls=False
):
-
+ self.log = logging.getLogger(__name__ + '.' + self.__class__.__name__)
self.base_directory = base_directory
self.proc_name = proc_name
self.port = port
@@ -34,7 +34,6 @@
self.schema = 'https://'
def run(self, proc_args=None):
- log = logging.getLogger()
if self.proc is not None:
raise Exception("etcd already running with pid %d", self.proc.pid)
client = '%s127.0.0.1:%d' % (self.schema, self.port)
@@ -49,8 +48,8 @@
daemon_args.extend(proc_args)
daemon = subprocess.Popen(daemon_args)
- log.debug('Started %d' % daemon.pid)
- log.debug('Params: %s' % daemon_args)
+ self.log.debug('Started etcd with pid %d' % daemon.pid)
+ self.log.debug('etcd params: %s' % daemon_args)
time.sleep(2)
self.proc = daemon
--
To view, visit https://gerrit.wikimedia.org/r/222302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8351ddc92ef05f23ba9ae282c150eea07b008be4
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
