Merge into trunk : loggerate-pserv : Code : MAAS

Status:

Merged

Approved by:

Graham Binns on 2014-07-30

Approved revision:

no longer in the source branch.

Merged at revision:

2623

Proposed branch:

lp://qastaging/~gmb/maas/loggerate-pserv

Merge into:

lp://qastaging/~maas-committers/maas/trunk

Diff against target:

660 lines (+88/-78)

16 files modified

src/maasserver/dns.py (+1/-1)
src/maasserver/models/node.py (+1/-3)
src/provisioningserver/boot/tftppath.py (+5/-5)
src/provisioningserver/boot_images.py (+6/-6)
src/provisioningserver/dhcp/detect.py (+12/-12)
src/provisioningserver/dhcp/leases.py (+6/-6)
src/provisioningserver/dhcp/tests/test_detect.py (+16/-15)
src/provisioningserver/drivers/hardware/seamicro.py (+9/-3)
src/provisioningserver/image_download_service.py (+3/-3)
src/provisioningserver/import_images/helpers.py (+2/-3)
src/provisioningserver/logger/log.py (+2/-1)
src/provisioningserver/logger/tests/test_logger.py (+2/-1)
src/provisioningserver/start_cluster_controller.py (+5/-4)
src/provisioningserver/tags.py (+11/-11)
src/provisioningserver/tests/test_upgrade_cluster.py (+1/-0)
src/provisioningserver/upgrade_cluster.py (+6/-4)

To merge this branch:

bzr merge lp://qastaging/~gmb/maas/loggerate-pserv

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)		2014-07-30	Approve on 2014-07-30
Review via email: mp+228819@code.qastaging.launchpad.net

Commit message

Finish converting pserv to use maaslog.

Description of the change

Also added some logging to modules that imported the logger but didn't use it(!). Most of the changes are mechanical; I also reformatted and de-linted.

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2014-07-30:

#

Approved with comments!

review: Approve

Revision history for this message

Graham Binns (gmb) wrote on 2014-07-30:

#

Download full text (24.6 KiB)

On 30 July 2014 11:57, Julian Edwards <email address hidden> wrote:
> Review: Approve
>
> Approved with comments!
>
> Diff comments:
>
>> === modified file 'src/maasserver/dns.py'
>> --- src/maasserver/dns.py 2014-07-29 15:34:04 +0000
>> +++ src/maasserver/dns.py 2014-07-30 10:35:43 +0000
>> @@ -42,12 +42,12 @@
>> from maasserver.server_address import get_maas_facing_server_address
>> from netaddr import IPAddress
>> from provisioningserver import tasks
>> -from provisioningserver.logger import get_maas_logger
>> from provisioningserver.dns.config import (
>> DNSForwardZoneConfig,
>> DNSReverseZoneConfig,
>> SRVRecord,
>> )
>> +from provisioningserver.logger import get_maas_logger
>>
>>
>> maaslog = get_maas_logger("dns")
>>
>> === modified file 'src/maasserver/models/node.py'
>> --- src/maasserver/models/node.py 2014-07-29 16:17:51 +0000
>> +++ src/maasserver/models/node.py 2014-07-30 10:35:43 +0000
>> @@ -47,9 +47,7 @@
>> )
>> from django.shortcuts import get_object_or_404
>> import djorm_pgarray.fields
>> -from maasserver import (
>> - DefaultMeta,
>> - )
>> +from maasserver import DefaultMeta
>> from maasserver.enum import (
>> NODE_BOOT,
>> NODE_BOOT_CHOICES,
>>
>> === modified file 'src/provisioningserver/boot/tftppath.py'
>> --- src/provisioningserver/boot/tftppath.py 2014-07-24 16:08:39 +0000
>> +++ src/provisioningserver/boot/tftppath.py 2014-07-30 10:35:43 +0000
>> @@ -21,7 +21,6 @@
>>
>> import errno
>> from itertools import chain
>> -from logging import getLogger
>> import os.path
>>
>> from provisioningserver import config
>> @@ -33,9 +32,10 @@
>> BootImageMapping,
>> )
>> from provisioningserver.import_images.helpers import ImageSpec
>> -
>> -
>> -logger = getLogger(__name__)
>> +from provisioningserver.logger import get_maas_logger
>> +
>> +
>> +maaslog = get_maas_logger(__name__)
>
> I must admit I have mixed feelings about using __name__ here an avoided it so far. I think I might prefer "tftp" here as that is the general area in which this is logging.

Yarp. Fixed.

>
>>
>>
>> def compose_image_path(osystem, arch, subarch, release, label):
>> @@ -229,7 +229,7 @@
>> except OSError as exception:
>> if exception.errno == errno.ENOENT:
>> # Directory does not exist, so return empty list.
>> - logger.warning("No boot images have been imported yet.")
>> + maaslog.warning("No boot images have been imported yet.")
>> return []
>>
>> # Other error. Propagate.
>>
>> === modified file 'src/provisioningserver/boot_images.py'
>> --- src/provisioningserver/boot_images.py 2014-05-22 08:28:28 +0000
>> +++ src/provisioningserver/boot_images.py 2014-07-30 10:35:43 +0000
>> @@ -17,7 +17,6 @@
>> ]
>>
>> import json
>> -from logging import getLogger
>>
>> from apiclient.maas_client import (
>> MAASClient,
>> @@ -31,9 +30,10 @@
>> get_maas_url,
>> )
>> from provisioningserver.config import Config
>> -
>> -
>> -logger = getLogger(__name__)
>> +from provisioningserver.logger import get_maas_logger
>> +
>> +
>> +maaslog = get_maas_logger(__name__)
>
> Same h...

On 30 July 2014 11:57, Julian Edwards <julian.edwards@canonical.com> wrote:
> Review: Approve
>
> Approved with comments!
>
> Diff comments:
>
>> === modified file 'src/maasserver/dns.py'
>> --- src/maasserver/dns.py     2014-07-29 15:34:04 +0000
>> +++ src/maasserver/dns.py     2014-07-30 10:35:43 +0000
>> @@ -42,12 +42,12 @@
>>  from maasserver.server_address import get_maas_facing_server_address
>>  from netaddr import IPAddress
>>  from provisioningserver import tasks
>> -from provisioningserver.logger import get_maas_logger
>>  from provisioningserver.dns.config import (
>>      DNSForwardZoneConfig,
>>      DNSReverseZoneConfig,
>>      SRVRecord,
>>      )
>> +from provisioningserver.logger import get_maas_logger
>>
>>
>>  maaslog = get_maas_logger("dns")
>>
>> === modified file 'src/maasserver/models/node.py'
>> --- src/maasserver/models/node.py     2014-07-29 16:17:51 +0000
>> +++ src/maasserver/models/node.py     2014-07-30 10:35:43 +0000
>> @@ -47,9 +47,7 @@
>>      )
>>  from django.shortcuts import get_object_or_404
>>  import djorm_pgarray.fields
>> -from maasserver import (
>> -    DefaultMeta,
>> -    )
>> +from maasserver import DefaultMeta
>>  from maasserver.enum import (
>>      NODE_BOOT,
>>      NODE_BOOT_CHOICES,
>>
>> === modified file 'src/provisioningserver/boot/tftppath.py'
>> --- src/provisioningserver/boot/tftppath.py   2014-07-24 16:08:39 +0000
>> +++ src/provisioningserver/boot/tftppath.py   2014-07-30 10:35:43 +0000
>> @@ -21,7 +21,6 @@
>>
>>  import errno
>>  from itertools import chain
>> -from logging import getLogger
>>  import os.path
>>
>>  from provisioningserver import config
>> @@ -33,9 +32,10 @@
>>      BootImageMapping,
>>      )
>>  from provisioningserver.import_images.helpers import ImageSpec
>> -
>> -
>> -logger = getLogger(__name__)
>> +from provisioningserver.logger import get_maas_logger
>> +
>> +
>> +maaslog = get_maas_logger(__name__)
>
> I must admit I have mixed feelings about using __name__ here an avoided it so far.  I think I might prefer "tftp" here as that is the general area in which this is logging.

Yarp. Fixed.

>
>>
>>
>>  def compose_image_path(osystem, arch, subarch, release, label):
>> @@ -229,7 +229,7 @@
>>      except OSError as exception:
>>          if exception.errno == errno.ENOENT:
>>              # Directory does not exist, so return empty list.
>> -            logger.warning("No boot images have been imported yet.")
>> +            maaslog.warning("No boot images have been imported yet.")
>>              return []
>>
>>          # Other error. Propagate.
>>
>> === modified file 'src/provisioningserver/boot_images.py'
>> --- src/provisioningserver/boot_images.py     2014-05-22 08:28:28 +0000
>> +++ src/provisioningserver/boot_images.py     2014-07-30 10:35:43 +0000
>> @@ -17,7 +17,6 @@
>>      ]
>>
>>  import json
>> -from logging import getLogger
>>
>>  from apiclient.maas_client import (
>>      MAASClient,
>> @@ -31,9 +30,10 @@
>>      get_maas_url,
>>      )
>>  from provisioningserver.config import Config
>> -
>> -
>> -logger = getLogger(__name__)
>> +from provisioningserver.logger import get_maas_logger
>> +
>> +
>> +maaslog = get_maas_logger(__name__)
>
> Same here - maybe "boot_image" ?

Yep.

>>
>>  def get_cached_knowledge():
>> @@ -44,10 +44,10 @@
>>      """
>>      maas_url = get_maas_url()
>>      if maas_url is None:
>> -        logger.debug("Not reporting boot images: don't have API URL yet.")
>> +        maaslog.debug("Not reporting boot images: don't have API URL yet.")
>>      api_credentials = get_recorded_api_credentials()
>>      if api_credentials is None:
>> -        logger.debug("Not reporting boot images: don't have API key yet.")
>> +        maaslog.debug("Not reporting boot images: don't have API key yet.")
>>      return maas_url, api_credentials
>>
>>
>>
>> === modified file 'src/provisioningserver/dhcp/detect.py'
>> --- src/provisioningserver/dhcp/detect.py     2014-02-18 03:24:14 +0000
>> +++ src/provisioningserver/dhcp/detect.py     2014-07-30 10:35:43 +0000
>> @@ -20,7 +20,6 @@
>>  import fcntl
>>  import httplib
>>  import json
>> -from logging import getLogger
>>  from random import randint
>>  import socket
>>  import struct
>> @@ -39,9 +38,10 @@
>>      get_recorded_nodegroup_uuid,
>>      )
>>  from provisioningserver.cluster_config import get_maas_url
>> -
>> -
>> -logger = getLogger(__name__)
>> +from provisioningserver.logger import get_maas_logger
>> +
>> +
>> +maaslog = get_maas_logger("dhcp.detect")
>>
>>
>>  def make_transaction_ID():
>> @@ -223,11 +223,11 @@
>>      try:
>>          response = client_func(*args, **kwargs)
>>      except (HTTPError, URLError) as e:
>> -        logger.error("Failed to contact region controller:\n%s", e)
>> +        maaslog.error("Failed to contact region controller:\n%s", e)
>>          return None
>>      code = response.getcode()
>>      if code != httplib.OK:
>> -        logger.error(
>> +        maaslog.error(
>>              "Failed talking to region controller, it returned:\n%s\n%s",
>>              code, response.read())
>>          return None
>> @@ -238,7 +238,7 @@
>>          else:
>>              return None
>>      except ValueError as e:
>> -        logger.error(
>> +        maaslog.error(
>>              "Failed to decode response from region controller:\n%s", e)
>>          return None
>>      return data
>> @@ -287,13 +287,13 @@
>>              # which we need to ignore; it means the interface has no IP
>>              # and there's no need to scan this interface as it's not in
>>              # use.
>> -            logger.info(
>> +            maaslog.info(
>>                  "Ignoring DHCP scan for %s, it has no IP address", interface)
>>          elif e.errno == errno.ENODEV:
>>              # Errno ENODEV is "no such device". This seems an odd situation
>>              # since we're scanning detected devices, so this is probably
>>              # a bug.
>> -            logger.error(
>> +            maaslog.error(
>>                  "Ignoring DHCP scan for %s, it no longer exists. Check "
>>                  "your cluster interfaces configuration.", interface)
>>          else:
>> @@ -341,7 +341,7 @@
>>      if None in knowledge.values():
>>          # The MAAS server hasn't sent us enough information for us to do
>>          # this yet.  Leave it for another time.
>> -        logger.info(
>> +        maaslog.info(
>>              "Not probing for rogue DHCP servers; not all required knowledge "
>>              "received from server yet.  "
>>              "Missing: %s" % ', '.join(sorted(
>> @@ -351,7 +351,7 @@
>>      # Determine all the active interfaces on this cluster (nodegroup).
>>      interfaces = determine_cluster_interfaces(knowledge)
>>      if interfaces is None:
>> -        logger.info("No interfaces on cluster, not probing DHCP.")
>> +        maaslog.info("No interfaces on cluster, not probing DHCP.")
>>          return
>>
>>      # Iterate over interfaces and probe each one.
>> @@ -359,7 +359,7 @@
>>          try:
>>              servers = probe_interface(interface, ip)
>>          except socket.error:
>> -            logger.exception(
>> +            maaslog.exception(
>
> Don't put exceptions in maaslog!  It needs to be nice and readable.  maaslog.warning is fine here IMO.

Wups. Yep.

>>                  "Failed to probe sockets; did you configure authbind as per "
>>                  "HACKING.txt?")
>>              return
>>
>> === modified file 'src/provisioningserver/dhcp/leases.py'
>> --- src/provisioningserver/dhcp/leases.py     2014-06-15 22:13:52 +0000
>> +++ src/provisioningserver/dhcp/leases.py     2014-07-30 10:35:43 +0000
>> @@ -36,7 +36,6 @@
>>
>>  import errno
>>  import json
>> -from logging import getLogger
>>  from os import (
>>      fstat,
>>      stat,
>> @@ -55,9 +54,10 @@
>>      )
>>  from provisioningserver.cluster_config import get_maas_url
>>  from provisioningserver.dhcp.leases_parser_fast import parse_leases
>> -
>> -
>> -logger = getLogger(__name__)
>> +from provisioningserver.logger import get_maas_logger
>> +
>> +
>> +maaslog = get_maas_logger("dhcp.leases")
>>
>>
>>  # Cache key for the modification time on last-processed leases file.
>> @@ -159,7 +159,7 @@
>>      if None in knowledge.values():
>>          # The MAAS server hasn't sent us enough information for us to do
>>          # this yet.  Leave it for another time.
>> -        logger.info(
>> +        maaslog.info(
>>              "Not sending DHCP leases to server: not all required knowledge "
>>              "received from server yet.  "
>>              "Missing: %s"
>> @@ -191,7 +191,7 @@
>>          timestamp, leases = parse_result
>>          process_leases(timestamp, leases)
>>      else:
>> -        logger.info(
>> +        maaslog.info(
>>              "The DHCP leases file does not exist.  This is only a problem if "
>>              "this cluster controller is managing its DHCP server.  If that's "
>>              "the case then you need to install the 'maas-dhcp' package on "
>>
>> === modified file 'src/provisioningserver/dhcp/tests/test_detect.py'
>> --- src/provisioningserver/dhcp/tests/test_detect.py  2014-07-16 14:12:13 +0000
>> +++ src/provisioningserver/dhcp/tests/test_detect.py  2014-07-30 10:35:43 +0000
>> @@ -449,21 +449,21 @@
>>          self.patch(MAASClient, 'get').side_effect = urllib2.HTTPError(
>>              mock.sentinel, mock.sentinel, mock.sentinel,
>>              mock.sentinel, mock.sentinel)
>> -        mocked_logging = self.patch(detect_module.logger, 'error')
>> +        mocked_logging = self.patch(detect_module.maaslog, 'error')
>>          determine_cluster_interfaces(self.knowledge)
>>          self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
>>
>>      def test_determine_cluster_interfaces_catches_URLError_in_MASClient(self):
>>          self.patch(MAASClient, 'get').side_effect = urllib2.URLError(
>>              mock.sentinel.arg1)
>> -        mocked_logging = self.patch(detect_module.logger, 'error')
>> +        mocked_logging = self.patch(detect_module.maaslog, 'error')
>>          determine_cluster_interfaces(self.knowledge)
>>          self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
>>
>>      def test_determine_cluster_interfaces_catches_non_OK_response(self):
>>          self.patch(MAASClient, 'get').return_value = MockResponse(
>>              httplib.NOT_FOUND, "error text")
>> -        mocked_logging = self.patch(detect_module.logger, 'error')
>> +        mocked_logging = self.patch(detect_module.maaslog, 'error')
>>          determine_cluster_interfaces(self.knowledge)
>>          self.assertThat(
>>              mocked_logging,
>> @@ -493,21 +493,21 @@
>>          self.patch(MAASClient, 'post').side_effect = urllib2.HTTPError(
>>              mock.sentinel, mock.sentinel, mock.sentinel,
>>              mock.sentinel, mock.sentinel)
>> -        mocked_logging = self.patch(detect_module.logger, 'error')
>> +        mocked_logging = self.patch(detect_module.maaslog, 'error')
>>          update_region_controller(self.knowledge, "eth0", None)
>>          self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
>>
>>      def test_update_region_controller_catches_URLError_in_MAASClient(self):
>>          self.patch(MAASClient, 'post').side_effect = urllib2.URLError(
>>              mock.sentinel.arg1)
>> -        mocked_logging = self.patch(detect_module.logger, 'error')
>> +        mocked_logging = self.patch(detect_module.maaslog, 'error')
>>          update_region_controller(self.knowledge, "eth0", None)
>>          self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
>>
>>      def test_update_region_controller_catches_non_OK_response(self):
>>          mock_response = MockResponse(httplib.NOT_FOUND, "error text")
>>          self.patch(MAASClient, 'post').return_value = mock_response
>> -        mocked_logging = self.patch(detect_module.logger, 'error')
>> +        mocked_logging = self.patch(detect_module.maaslog, 'error')
>>          update_region_controller(self.knowledge, "eth0", None)
>>          self.assertThat(mocked_logging, MockCalledOnceWith(
>>              mock.ANY, mock_response.getcode(), mock_response.read()))
>>
>> === modified file 'src/provisioningserver/drivers/hardware/seamicro.py'
>> --- src/provisioningserver/drivers/hardware/seamicro.py       2014-06-24 11:37:01 +0000
>> +++ src/provisioningserver/drivers/hardware/seamicro.py       2014-07-30 10:35:43 +0000
>> @@ -18,17 +18,17 @@
>>
>>  import httplib
>>  import json
>> -import logging
>>  import time
>>  import urllib2
>>  import urlparse
>>
>> +from provisioningserver.logger import get_maas_logger
>>  import provisioningserver.utils as utils
>>  from seamicroclient import exceptions as seamicro_exceptions
>>  from seamicroclient.v2 import client as seamicro_client
>>
>>
>> -logger = logging.getLogger(__name__)
>> +maaslog = get_maas_logger(__name__)
>
> "drivers.seamicro" ?

Yep.

>>
>>
>>  class POWER_STATUS:
>> @@ -272,6 +272,10 @@
>>  def probe_seamicro15k_and_enlist(ip, username, password, power_control=None):
>>      power_control = power_control or 'ipmi'
>>
>> +    maaslog.info(
>> +        "Probing for seamicro15k nodes with arguments "
>> +        "ip=%s, username=%s, password=%s, power_control=%s" %
>> +        (ip, username, password, power_control))
>
> Don't use string interpolation here, just pass the args to the logger.

Scheiße.

>>      servers = find_seamicro15k_servers(ip, username, password, power_control)
>>      for system_id, macs in servers:
>>          params = {
>> @@ -281,7 +285,9 @@
>>              'power_control': power_control,
>>              'system_id': system_id
>>          }
>> -
>> +        maaslog.info(
>> +            "Found seamicro15k node with macs %s; adding to MAAS with "
>> +            "params : %s" % (macs, params))
>
> Same here.

Doppelscheiße.

>>          utils.create_node(macs, 'amd64', 'sm15k', params)
>>
>>
>>
>> === modified file 'src/provisioningserver/image_download_service.py'
>> --- src/provisioningserver/image_download_service.py  2014-07-25 11:31:14 +0000
>> +++ src/provisioningserver/image_download_service.py  2014-07-30 10:35:43 +0000
>> @@ -20,11 +20,11 @@
>>
>>
>>  from datetime import timedelta
>> -from logging import getLogger
>>
>>  from provisioningserver.auth import MAAS_USER_GPGHOME
>>  from provisioningserver.boot.tftppath import maas_meta_last_modified
>>  from provisioningserver.import_images import boot_resources
>> +from provisioningserver.logger import get_maas_logger
>>  from provisioningserver.rpc.exceptions import NoConnectionsAvailable
>>  from provisioningserver.rpc.region import (
>>      GetBootSources,
>> @@ -40,7 +40,7 @@
>>  from twisted.internet.threads import deferToThread
>>
>>
>> -logger = getLogger(__name__)
>> +maaslog = get_maas_logger(__name__)
>
> "image_download_service" ?
>
>>  service_lock = DeferredLock()
>>
>>
>> @@ -91,7 +91,7 @@
>>              except NoConnectionsAvailable:
>>                  yield pause(5)
>>          if client is None:
>> -            logger.error(
>> +            maaslog.error(
>>                  "Can't initiate image download, no RPC connection to region.")
>>              return
>>
>>
>> === modified file 'src/provisioningserver/import_images/helpers.py'
>> --- src/provisioningserver/import_images/helpers.py   2014-07-29 16:27:14 +0000
>> +++ src/provisioningserver/import_images/helpers.py   2014-07-30 10:35:43 +0000
>> @@ -15,16 +15,15 @@
>>  __all__ = [
>>      'get_signing_policy',
>>      'ImageSpec',
>> -    'logger',
>> +    'maaslog',
>>      ]
>>
>>  from collections import namedtuple
>>  import functools
>> +
>>  from provisioningserver.logger import get_maas_logger
>> -
>>  from simplestreams.util import policy_read_signed
>>
>> -
>>  # A tuple of the items that together select a boot image.
>>  ImageSpec = namedtuple(b'ImageSpec', [
>>      'arch',
>>
>> === modified file 'src/provisioningserver/logger/log.py'
>> --- src/provisioningserver/logger/log.py      2014-07-29 17:04:33 +0000
>> +++ src/provisioningserver/logger/log.py      2014-07-30 10:35:43 +0000
>> @@ -45,6 +45,7 @@
>>      maaslog.setLevel(logging.DEBUG)
>>      handler = SysLogHandler("/dev/log")
>>      maaslog.addHandler(handler)
>> -    formatter = logging.Formatter(fmt=maaslog.name + ": [%(levelname)s] %(message)s")
>> +    formatter = logging.Formatter(
>> +        fmt=maaslog.name + ": [%(levelname)s] %(message)s")
>>      handler.setFormatter(formatter)
>>      return maaslog
>>
>> === modified file 'src/provisioningserver/logger/tests/test_logger.py'
>> --- src/provisioningserver/logger/tests/test_logger.py        2014-07-29 17:04:33 +0000
>> +++ src/provisioningserver/logger/tests/test_logger.py        2014-07-30 10:35:43 +0000
>> @@ -47,7 +47,8 @@
>>          self.assertThat(
>>              formatter,
>>              MockCalledOnceWith(
>> -                fmt=("maas.%s:" % extra_formatting) + " [%(levelname)s] %(message)s"))
>> +                fmt=("maas.%s:" % extra_formatting) +
>> +                " [%(levelname)s] %(message)s"))
>>
>>      def test_sets_logger_name(self):
>>          self.patch(log, 'SysLogHandler')
>>
>> === modified file 'src/provisioningserver/start_cluster_controller.py'
>> --- src/provisioningserver/start_cluster_controller.py        2014-01-14 16:35:13 +0000
>> +++ src/provisioningserver/start_cluster_controller.py        2014-07-30 10:35:43 +0000
>> @@ -20,7 +20,6 @@
>>  from grp import getgrnam
>>  import httplib
>>  import json
>> -from logging import getLogger
>>  import os
>>  from pwd import getpwnam
>>  from time import sleep
>> @@ -35,10 +34,11 @@
>>      NoAuth,
>>      )
>>  from provisioningserver.cluster_config import get_cluster_uuid
>> +from provisioningserver.logger import get_maas_logger
>>  from provisioningserver.network import discover_networks
>>
>>
>> -logger = getLogger(__name__)
>> +maaslog = get_maas_logger(__name__)
>
> "cluster" ?

Yep.

>>
>>
>>  class ClusterControllerRejected(Exception):
>> @@ -58,7 +58,7 @@
>>
>>
>>  def log_error(exception):
>> -    logger.info(
>> +    maaslog.info(
>>          "Could not register with region controller: %s."
>>          % exception.reason)
>>
>> @@ -141,7 +141,7 @@
>>      try:
>>          client.post('api/1.0/nodegroups/', 'refresh_workers')
>>      except URLError as e:
>> -        logger.warn(
>> +        maaslog.warn(
>>              "Could not request secrets from region controller: %s"
>>              % e.reason)
>>
>> @@ -176,6 +176,7 @@
>>      If this system is still awaiting approval as a cluster controller, this
>>      command will keep looping until it gets a definite answer.
>>      """
>> +    maaslog.info("Starting cluster controller %s." % get_cluster_uuid())
>>      set_up_logging()
>>      connection_details = register(args.server_url)
>>      while connection_details is None:
>>
>> === modified file 'src/provisioningserver/tags.py'
>> --- src/provisioningserver/tags.py    2013-10-15 11:35:10 +0000
>> +++ src/provisioningserver/tags.py    2014-07-30 10:35:43 +0000
>> @@ -25,7 +25,6 @@
>>  from collections import OrderedDict
>>  from functools import partial
>>  import httplib
>> -from logging import getLogger
>>  import urllib2
>>
>>  from apiclient.maas_client import (
>> @@ -40,6 +39,7 @@
>>      get_recorded_nodegroup_uuid,
>>      )
>>  from provisioningserver.cluster_config import get_maas_url
>> +from provisioningserver.logger import get_maas_logger
>>  from provisioningserver.utils import (
>>      classify,
>>      try_match_xpath,
>> @@ -47,7 +47,7 @@
>>  import simplejson as json
>>
>>
>> -logger = getLogger(__name__)
>> +maaslog = get_maas_logger(__name__)
>
> "tag_processing" ?

Yep.

>>
>>
>>  class MissingCredentials(Exception):
>> @@ -69,11 +69,11 @@
>>      """
>>      api_credentials = get_recorded_api_credentials()
>>      if api_credentials is None:
>> -        logger.error("Not updating tags: don't have API key yet.")
>> +        maaslog.error("Not updating tags: don't have API key yet.")
>>          return None, None
>>      nodegroup_uuid = get_recorded_nodegroup_uuid()
>>      if nodegroup_uuid is None:
>> -        logger.error("Not updating tags: don't have UUID yet.")
>> +        maaslog.error("Not updating tags: don't have UUID yet.")
>>          return None, None
>>      client = MAASClient(
>>          MAASOAuth(*api_credentials), MAASDispatcher(),
>> @@ -150,7 +150,7 @@
>>      :param removed: Set of nodes to remove
>>      """
>>      path = '/api/1.0/tags/%s/' % (tag_name,)
>> -    logger.debug(
>> +    maaslog.debug(
>>          "Updating nodes for %s %s, adding %s removing %s"
>>          % (tag_name, uuid, len(added), len(removed)))
>>      try:
>> @@ -163,7 +163,7 @@
>>                  msg = e.fp.read()
>>              else:
>>                  msg = e.msg
>> -            logger.info("Got a CONFLICT while updating tag: %s", msg)
>> +            maaslog.info("Got a CONFLICT while updating tag: %s", msg)
>>              return {}
>>          raise
>>
>> @@ -198,7 +198,7 @@
>>          try:
>>              lshw = etree.fromstring(xmldata)
>>          except etree.XMLSyntaxError as e:
>> -            logger.warn("Invalid lshw details: %s", e)
>> +            maaslog.warn("Invalid lshw details: %s", e)
>>              del details["lshw"]  # Don't process again later.
>>          else:
>>              # We're throwing away the existing root, but we can adopt
>> @@ -218,7 +218,7 @@
>>              try:
>>                  detail = etree.fromstring(xmldata)
>>              except etree.XMLSyntaxError as e:
>> -                logger.warn("Invalid %s details: %s", namespace, e)
>> +                maaslog.warn("Invalid %s details: %s", namespace, e)
>>              else:
>>                  # Add the namespace to all unqualified elements.
>>                  for elem in detail.iter("{}*"):
>> @@ -327,7 +327,7 @@
>>
>>  def process_all(client, tag_name, tag_definition, nodegroup_uuid, system_ids,
>>                  xpath, batch_size=None):
>> -    logger.debug(
>> +    maaslog.debug(
>>          "processing %d system_ids for tag %s nodegroup %s",
>>          len(system_ids), tag_name, nodegroup_uuid)
>>
>> @@ -337,7 +337,7 @@
>>      batches = gen_batches(system_ids, batch_size)
>>      node_details = gen_node_details(client, nodegroup_uuid, batches)
>>      nodes_matched, nodes_unmatched = classify(
>> -        partial(try_match_xpath, xpath, logger=logger), node_details)
>> +        partial(try_match_xpath, xpath, logger=maaslog), node_details)
>>
>>      # Upload all updates for one nodegroup at one time. This should be no more
>>      # than ~41*10,000 = 410kB. That should take <1s even on a 10Mbit network.
>> @@ -357,7 +357,7 @@
>>      """
>>      client, nodegroup_uuid = get_cached_knowledge()
>>      if not all([client, nodegroup_uuid]):
>> -        logger.error(
>> +        maaslog.error(
>>              "Unable to update tag: %s for definition %r. "
>>              "Please refresh secrets, then rebuild this tag."
>>              % (tag_name, tag_definition))
>>
>> === modified file 'src/provisioningserver/tests/test_upgrade_cluster.py'
>> --- src/provisioningserver/tests/test_upgrade_cluster.py      2014-07-16 14:12:13 +0000
>> +++ src/provisioningserver/tests/test_upgrade_cluster.py      2014-07-30 10:35:43 +0000
>> @@ -26,7 +26,7 @@
>>      )
>>  from maastesting.testcase import MAASTestCase
>>  from maastesting.utils import sample_binary_data
>> -from mock import Mock
>> +from mock import MagicMock
>>  from provisioningserver import (
>>      config,
>>      upgrade_cluster,
>> @@ -56,7 +56,8 @@
>>          self.patch(upgrade_cluster, 'UPGRADE_HOOKS', hooks)
>>
>>      def test_calls_hooks(self):
>> -        upgrade_hook = Mock()
>> +        upgrade_hook = MagicMock()
>> +        upgrade_hook.__name__ = "upgrade_hook"
>>          self.patch_upgrade_hooks([upgrade_hook])
>>          self.run_command()
>>          self.assertThat(upgrade_hook, MockCalledOnceWith())
>>
>> === modified file 'src/provisioningserver/upgrade_cluster.py'
>> --- src/provisioningserver/upgrade_cluster.py 2014-07-15 07:45:59 +0000
>> +++ src/provisioningserver/upgrade_cluster.py 2014-07-30 10:35:43 +0000
>> @@ -32,7 +32,6 @@
>>      'run',
>>      ]
>>
>> -from logging import getLogger
>>  import os
>>  from os import makedirs
>>  import shutil
>> @@ -49,9 +48,10 @@
>>      update_targets_conf,
>>      write_targets_conf,
>>      )
>> -
>> -
>> -logger = getLogger(__name__)
>> +from provisioningserver.logger import get_maas_logger
>> +
>> +
>> +maaslog = get_maas_logger(__name__)
>
> "cluster_upgrade" ?

Yep.

>>
>>
>>  def make_maas_own_boot_resources():
>> @@ -229,4 +229,6 @@
>>  def run(args):
>>      """Perform any data migrations needed for upgrading this cluster."""
>>      for hook in UPGRADE_HOOKS:
>> +        maaslog.info("Cluster upgrade hook %s started." % hook.__name__)
>>          hook()
>> +        maaslog.info("Cluster upgrade hook %s finished." % hook.__name__)
>>
>
>
> --
> https://code.launchpad.net/~gmb/maas/loggerate-pserv/+merge/228819
> You are the owner of lp:~gmb/maas/loggerate-pserv.

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-07-30:

#

Download full text (22.7 KiB)

The attempt to merge lp:~gmb/maas/loggerate-pserv into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release [58.5 kB]
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Ign http://security.ubuntu.com trusty-security/main Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [102 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [62.6 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [275 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [163 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 662 kB in 0s (1,674 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netiface...

The attempt to merge lp:~gmb/maas/loggerate-pserv into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release [58.5 kB]
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Ign http://security.ubuntu.com trusty-security/main Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [102 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [62.6 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [275 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [163 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 662 kB in 0s (1,674 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplestreams python-sphinx python-tempita python-twisted python-txamqp python-txlongpoll python-txtftp python-virtualenv python-yaml rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
freeipmi-tools is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
libpq-dev is already the newest version.
make is already the newest version.
postgresql is already the newest version.
python-amqplib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-curtin is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-tempita is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-txtftp is already the newest version.
python-yaml is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
apache2 is already the newest version.
dh-apport is already the newest version.
firefox is already the newest version.
python-bzrlib is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 40 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge python-librabbitmq
Reading package lists...
Building dependency tree...
Reading state information...
Package 'python-librabbitmq' is not installed, so not removed
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 40 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.TIHxKf/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.TIHxKf/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.TIHxKf
New python executable in /tmp/tarmac/branch.TIHxKf/bin/python2.7
Also creating executable in /tmp/tarmac/branch.TIHxKf/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/tmp/tarmac/branch.TIHxKf/parts'.
Creating directory '/tmp/tarmac/branch.TIHxKf/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.TIHxKf/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/celeryd.region'.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/celeryd.cluster'.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/maas-probe-dhcp'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/tmp/tarmac/branch.TIHxKf/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.TIHxKf/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.TIHxKf/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
bin/buildout install maas
Updating maas.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.631s

OK
..S...................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S.....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................E.................................................................................................................................
======================================================================
ERROR: test suite for <class 'maasserver.views.tests.test_nodes.NodeProbedDetailsExpanderTest'>
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/.buildout/eggs/nose-1.3.0-py2.7.egg/nose/suite.py", line 208, in run
    self.setUp()
  File "/home/ubuntu/.buildout/eggs/nose-1.3.0-py2.7.egg/nose/suite.py", line 291, in setUp
    self.setupContext(ancestor)
  File "/home/ubuntu/.buildout/eggs/nose-1.3.0-py2.7.egg/nose/suite.py", line 314, in setupContext
    try_run(context, names)
  File "/home/ubuntu/.buildout/eggs/nose-1.3.0-py2.7.egg/nose/util.py", line 469, in try_run
    return func()
  File "/tmp/tarmac/branch.TIHxKf/src/maasserver/testing/testcase.py", line 163, in setUpClass
    cls.selenium = WebDriver()
  File "/home/ubuntu/.buildout/eggs/selenium-2.39.0-py2.7.egg/selenium/webdriver/firefox/webdriver.py", line 59, in __init__
    self.binary, timeout),
  File "/home/ubuntu/.buildout/eggs/selenium-2.39.0-py2.7.egg/selenium/webdriver/firefox/extension_connection.py", line 47, in __init__
    self.binary.launch_browser(self.profile)
  File "/home/ubuntu/.buildout/eggs/selenium-2.39.0-py2.7.egg/selenium/webdriver/firefox/firefox_binary.py", line 61, in launch_browser
    self._wait_until_connectable()
  File "/home/ubuntu/.buildout/eggs/selenium-2.39.0-py2.7.egg/selenium/webdriver/firefox/firefox_binary.py", line 100, in _wait_until_connectable
    self._get_firefox_output())
WebDriverException: Message: "The browser appears to have exited before we could connect. The output was: \n(process:23802): GLib-CRITICAL **: g_slice_set_config: assertion 'sys_page_size == 0' failed\nError: cannot open display: :99\n" 
-------------------- >> begin captured logging << --------------------
selenium.webdriver.remote.remote_connection: DEBUG: DELETE http://127.0.0.1:48547/hub/session/f667119c-48dd-4cd2-b34a-355fbc40412a {"sessionId": "f667119c-48dd-4cd2-b34a-355fbc40412a"}
selenium.webdriver.remote.remote_connection: DEBUG: Finished Request
--------------------- >> end captured logging << ---------------------

----------------------------------------------------------------------
Ran 2877 tests in 403.039s

FAILED (SKIP=2, errors=1)
...........................................................................................................
----------------------------------------------------------------------
Ran 107 tests in 1.699s

OK
..............................................................S..S.....................................................................
----------------------------------------------------------------------
Ran 135 tests in 2.479s

OK (SKIP=2)
........................................................................................................................................................................F.F..........FF.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
======================================================================
FAIL: provisioningserver.dhcp.tests.test_detect.TestPeriodicTask.test_determine_cluster_interfaces_catches_URLError_in_MASClient
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.TIHxKf/src/provisioningserver/dhcp/tests/test_detect.py", line 461, in test_determine_cluster_interfaces_catches_URLError_in_MASClient
    self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 414, in assertThat
    raise MismatchError(matchee, matcher, mismatch, verbose)
MismatchError: Expected to be called once. Called 0 times.

-------------------- >> begin captured logging << --------------------
maas.dhcp.detect: WARNING: Failed to contact region controller:
<urlopen error sentinel.arg1>
--------------------- >> end captured logging << ---------------------

======================================================================
FAIL: provisioningserver.dhcp.tests.test_detect.TestPeriodicTask.test_determine_cluster_interfaces_catchs_HTTPError_in_MASClient
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.TIHxKf/src/provisioningserver/dhcp/tests/test_detect.py", line 454, in test_determine_cluster_interfaces_catchs_HTTPError_in_MASClient
    self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 414, in assertThat
    raise MismatchError(matchee, matcher, mismatch, verbose)
MismatchError: Expected to be called once. Called 0 times.

-------------------- >> begin captured logging << --------------------
maas.dhcp.detect: WARNING: Failed to contact region controller:
HTTP Error <mock._Sentinel object at 0x2ad073afdad0>: <mock._Sentinel object at 0x2ad073afdad0>
--------------------- >> end captured logging << ---------------------

======================================================================
FAIL: provisioningserver.dhcp.tests.test_detect.TestPeriodicTask.test_update_region_controller_catches_HTTPError_in_MAASClient
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.TIHxKf/src/provisioningserver/dhcp/tests/test_detect.py", line 498, in test_update_region_controller_catches_HTTPError_in_MAASClient
    self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 414, in assertThat
    raise MismatchError(matchee, matcher, mismatch, verbose)
MismatchError: Expected to be called once. Called 0 times.

-------------------- >> begin captured logging << --------------------
maas.dhcp.detect: WARNING: Failed to contact region controller:
HTTP Error <mock._Sentinel object at 0x2ad073afdad0>: <mock._Sentinel object at 0x2ad073afdad0>
--------------------- >> end captured logging << ---------------------

======================================================================
FAIL: provisioningserver.dhcp.tests.test_detect.TestPeriodicTask.test_update_region_controller_catches_URLError_in_MAASClient
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.TIHxKf/src/provisioningserver/dhcp/tests/test_detect.py", line 505, in test_update_region_controller_catches_URLError_in_MAASClient
    self.assertThat(mocked_logging, MockCalledOnceWith(mock.ANY, mock.ANY))
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 414, in assertThat
    raise MismatchError(matchee, matcher, mismatch, verbose)
MismatchError: Expected to be called once. Called 0 times.

-------------------- >> begin captured logging << --------------------
maas.dhcp.detect: WARNING: Failed to contact region controller:
<urlopen error sentinel.arg1>
--------------------- >> end captured logging << ---------------------

----------------------------------------------------------------------
Ran 1252 tests in 30.963s

FAILED (failures=4)
make: *** [test] Error 123

MAAS

Merge lp://qastaging/~gmb/maas/loggerate-pserv into lp://qastaging/~maas-committers/maas/trunk

Commit message

Description of the change

Preview Diff

Subscribers