From e958531929e04364759a721a689665ef891ff623 Mon Sep 17 00:00:00 2001
From: RongzeZhu <zrzhit@gmail.com>
Date: Fri, 17 Aug 2012 22:24:43 +0800
Subject: [PATCH] Remove logging in volume tests

Fixes bug #932137

Usage of logging seems to be limited to the check_for_export() tests and
should be to cleanup. check_for_export() raises an exception if there's
a problem and it does nothing if it succeeds. The tests should just
check whether an exception was raised.

Change-Id: I72bc3d97aa75950c7f31fae03535c541059501c2
---
 cinder/tests/test_volume.py | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index 18c5c5ec4..4f117902d 100644
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -22,8 +22,6 @@ Tests for Volume Code.
 
 import os
 import datetime
-import cStringIO
-import logging
 
 import mox
 import shutil
@@ -34,7 +32,6 @@ from cinder import exception
 from cinder import db
 from cinder import flags
 from cinder.tests.image import fake as fake_image
-from cinder.openstack.common import log as os_logging
 from cinder.openstack.common import importutils
 from cinder.openstack.common.notifier import test_notifier
 from cinder.openstack.common import rpc
@@ -44,7 +41,6 @@ from cinder import test
 import cinder.volume.api
 
 FLAGS = flags.FLAGS
-LOG = os_logging.getLogger(__name__)
 
 
 class VolumeTestCase(test.TestCase):
@@ -243,7 +239,6 @@ class VolumeTestCase(test.TestCase):
                                                           volume_id)
             self.assert_(iscsi_target not in targets)
             targets.append(iscsi_target)
-            LOG.debug(_("Target %s allocated"), iscsi_target)
         total_slots = FLAGS.iscsi_num_targets
         for _index in xrange(total_slots):
             volume = self._create_volume()
@@ -628,8 +623,7 @@ class DriverTestCase(test.TestCase):
         super(DriverTestCase, self).setUp()
         vol_tmpdir = tempfile.mkdtemp()
         self.flags(volume_driver=self.driver_name,
-                   volumes_dir=vol_tmpdir,
-                   logging_default_format_string="%(message)s")
+                   volumes_dir=vol_tmpdir)
         self.volume = importutils.import_object(FLAGS.volume_manager)
         self.context = context.get_admin_context()
         self.output = ""
@@ -639,10 +633,6 @@ class DriverTestCase(test.TestCase):
             return self.output, None
         self.volume.driver.set_execute(_fake_execute)
 
-        log = logging.getLogger()
-        self.stream = cStringIO.StringIO()
-        log.addHandler(logging.StreamHandler(self.stream))
-
     def tearDown(self):
         try:
             shutil.rmtree(FLAGS.volumes_dir)
@@ -651,8 +641,7 @@ class DriverTestCase(test.TestCase):
         super(DriverTestCase, self).tearDown()
 
     def _attach_volume(self):
-        """Attach volumes to an instance. This function also sets
-           a fake log message."""
+        """Attach volumes to an instance. """
         return []
 
     def _detach_volume(self, volume_id_list):
@@ -689,8 +678,7 @@ class ISCSITestCase(DriverTestCase):
     driver_name = "cinder.volume.driver.ISCSIDriver"
 
     def _attach_volume(self):
-        """Attach volumes to an instance. This function also sets
-           a fake log message."""
+        """Attach volumes to an instance. """
         volume_id_list = []
         for index in xrange(3):
             vol = {}
@@ -709,14 +697,10 @@ class ISCSITestCase(DriverTestCase):
         return volume_id_list
 
     def test_check_for_export_with_no_volume(self):
-        """No log message when no volume is attached to an instance."""
-        self.stream.truncate(0)
         instance_uuid = '12345678-1234-5678-1234-567812345678'
         self.volume.check_for_export(self.context, instance_uuid)
-        self.assertEqual(self.stream.getvalue(), '')
 
     def test_check_for_export_with_all_volume_exported(self):
-        """No log message when all the processes are running."""
         volume_id_list = self._attach_volume()
 
         self.mox.StubOutWithMock(self.volume.driver.tgtadm, 'show_target')
@@ -724,11 +708,9 @@ class ISCSITestCase(DriverTestCase):
             tid = db.volume_get_iscsi_target_num(self.context, i)
             self.volume.driver.tgtadm.show_target(tid)
 
-        self.stream.truncate(0)
         self.mox.ReplayAll()
         instance_uuid = '12345678-1234-5678-1234-567812345678'
         self.volume.check_for_export(self.context, instance_uuid)
-        self.assertEqual(self.stream.getvalue(), '')
         self.mox.UnsetStubs()
 
         self._detach_volume(volume_id_list)
@@ -749,8 +731,6 @@ class ISCSITestCase(DriverTestCase):
                           self.volume.check_for_export,
                           self.context,
                           instance_uuid)
-        msg = _("Cannot confirm exported volume id:%s.") % volume_id_list[0]
-        self.assertTrue(0 <= self.stream.getvalue().find(msg))
         self.mox.UnsetStubs()
 
         self._detach_volume(volume_id_list)
-- 
2.45.2