By doing this, we don't need to repeat the log level convert code any more.
Also, logs have colors now.
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
import samba
from samba import getopt as options
from samba import colour
import samba
from samba import getopt as options
from samba import colour
+from samba.logger import get_samba_logger
from ldb import LdbError
import sys
import traceback
from ldb import LdbError
import sys
import traceback
"""Run the command. This should be overridden by all subclasses."""
raise NotImplementedError(self.run)
"""Run the command. This should be overridden by all subclasses."""
raise NotImplementedError(self.run)
- def get_logger(self, name="netcmd"):
+ def get_logger(self, name="", verbose=False, quiet=False, **kwargs):
"""Get a logger object."""
"""Get a logger object."""
- import logging
- logger = logging.getLogger(name)
- logger.addHandler(logging.StreamHandler(self.errf))
- return logger
+ return get_samba_logger(
+ name=name or self.name, stream=self.errf,
+ verbose=verbose, quiet=quiet,
+ **kwargs)
def apply_colour_choice(self, requested):
"""Heuristics to work out whether the user wants colour output, from a
def apply_colour_choice(self, requested):
"""Heuristics to work out whether the user wants colour output, from a
(result, out, err) = self._create_computer(computer)
self.assertCmdSuccess(result, out, err)
(result, out, err) = self._create_computer(computer)
self.assertCmdSuccess(result, out, err)
- self.assertEquals(err, "", "There shouldn't be any error message")
+ self.assertNotIn(
+ "ERROR", err, "There shouldn't be any error message")
self.assertIn("Computer '%s' created successfully" %
computer["name"], out)
self.assertIn("Computer '%s' created successfully" %
computer["name"], out)