Merge "Use oslo.log for heat_integrationtests"

This commit is contained in:
Jenkins 2015-03-17 08:03:28 +00:00 committed by Gerrit Code Review
commit d98e868980
12 changed files with 7 additions and 33 deletions

@ -20,10 +20,6 @@ import neutronclient.v2_0.client
import novaclient.client
import swiftclient
import logging
LOG = logging.getLogger(__name__)
class ClientManager(object):
"""

@ -11,12 +11,12 @@
# under the License.
import cStringIO
import logging
import re
import select
import socket
import time
from oslo_log import log as logging
import paramiko
import six

@ -10,7 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
import os
import random
import re
@ -19,6 +18,7 @@ import time
import fixtures
from heatclient import exc as heat_exceptions
from oslo_log import log as logging
from oslo_utils import timeutils
import six
import testscenarios
@ -111,8 +111,8 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
if not servers:
servers = self.compute_client.servers.list()
for server in servers:
LOG.debug('Console output for %s', server.id)
LOG.debug(server.get_console_output())
LOG.info('Console output for %s', server.id)
LOG.info(server.get_console_output())
def _load_template(self, base_file, file_name, sub_dir=None):
sub_dir = sub_dir or ''

@ -12,8 +12,8 @@
import copy
import json
import logging
from oslo_log import log as logging
from testtools import matchers
from heat_integrationtests.common import test

@ -12,10 +12,10 @@
import hashlib
import json
import logging
import random
import urlparse
from oslo_log import log as logging
from swiftclient import utils as swiftclient_utils
import yaml

@ -12,16 +12,12 @@
import copy
import json
import logging
from testtools import matchers
from heat_integrationtests.common import test
LOG = logging.getLogger(__name__)
class InstanceGroupTest(test.HeatIntegrationTest):
template = '''

@ -10,15 +10,12 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
from heatclient import exc
import six
from heat_integrationtests.common import test
LOG = logging.getLogger(__name__)
class RemoteStackTest(test.HeatIntegrationTest):
template = '''

@ -11,16 +11,12 @@
# under the License.
import json
import logging
import yaml
from heat_integrationtests.common import test
LOG = logging.getLogger(__name__)
class TemplateResourceTest(test.HeatIntegrationTest):
"""Prove that we can use the registry in a nested provider."""

@ -10,14 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
from heat_integrationtests.common import test
LOG = logging.getLogger(__name__)
class UpdateStackTest(test.HeatIntegrationTest):
template = '''

@ -10,14 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
from heat_integrationtests.common import test
LOG = logging.getLogger(__name__)
class StackValidationTest(test.HeatIntegrationTest):
def setUp(self):

@ -11,13 +11,10 @@
# under the License.
import json
import logging
from heat_integrationtests.common import exceptions
from heat_integrationtests.scenario import scenario_base
LOG = logging.getLogger(__name__)
class CfnInitIntegrationTest(scenario_base.ScenarioTestsBase):
"""

@ -10,9 +10,9 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
from cinderclient import exceptions as cinder_exceptions
from oslo_log import log as logging
import six
from testtools import testcase