commit 00250041d5210588632d0f2c79aec456163d633d
Author: Radek Novacek <rnovacek(a)redhat.com>
Date: Tue Sep 9 16:17:07 2014 +0200
tests: use common TestBase class for all tests
tests/base.py | 14 ++++++++++++++
tests/test_config.py | 4 ++--
tests/test_esx.py | 7 +++----
tests/test_libvirtd.py | 10 ++++------
tests/test_manager.py | 11 ++++-------
tests/test_password.py | 4 ++--
tests/test_satellite.py | 6 +++---
tests/test_virtwho.py | 18 ++++++++----------
8 files changed, 40 insertions(+), 34 deletions(-)
---
diff --git a/tests/base.py b/tests/base.py
index d4edeff..3b9de96 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -26,3 +26,17 @@ if sys.version_info[0] > 2 or sys.version_info[1] > 6:
import unittest
else:
import unittest2 as unittest
+
+import logging
+import log
+from mock import patch
+
+
+class TestBase(unittest.TestCase):
+ @classmethod
+ @patch('log.getLogger')
+ def setUpClass(cls, logger):
+ cls.logger = logging.getLogger("")
+ cls.logger.handlers = []
+ cls.logger.setLevel(logging.CRITICAL)
+ logger.return_value = cls.logger
diff --git a/tests/test_config.py b/tests/test_config.py
index f549b1c..59e067e 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -23,10 +23,10 @@ import os
import shutil
from config import ConfigManager, InvalidOption
from tempfile import mkdtemp
-from base import unittest
+from base import TestBase, unittest
-class TestReadingConfigs(unittest.TestCase):
+class TestReadingConfigs(TestBase):
def setUp(self):
self.config_dir = mkdtemp()
self.addCleanup(shutil.rmtree, self.config_dir)
diff --git a/tests/test_esx.py b/tests/test_esx.py
index 8c63760..ef18fe6 100644
--- a/tests/test_esx.py
+++ b/tests/test_esx.py
@@ -23,17 +23,16 @@ import urllib2
import suds
from mock import patch
-from base import unittest
+from base import TestBase
from config import Config
from virt.esx import Esx
from virt import VirtError
-class TestEsx(unittest.TestCase):
+class TestEsx(TestBase):
def setUp(self):
- logger = logging.getLogger()
config = Config('test', 'esx', 'localhost',
'username', 'password', 'owner', 'env')
- self.esx = Esx(logger, config)
+ self.esx = Esx(self.logger, config)
@patch('suds.client.Client')
def test_connect(self, mock_client):
diff --git a/tests/test_libvirtd.py b/tests/test_libvirtd.py
index 4494524..58160e2 100644
--- a/tests/test_libvirtd.py
+++ b/tests/test_libvirtd.py
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
"""
import threading
-from base import unittest
+from base import TestBase
from mock import patch, Mock
import logging
@@ -34,23 +34,21 @@ def raiseLibvirtError(*args, **kwargs):
raise libvirt.libvirtError('')
-class TestLibvirtd(unittest.TestCase):
+class TestLibvirtd(TestBase):
def setUp(self):
pass
@patch('libvirt.openReadOnly')
def test_read(self, libvirt):
- logger = logging.getLogger()
config = Config('test', 'libvirt')
- libvirtd = Virt.fromConfig(logger, config)
+ libvirtd = Virt.fromConfig(self.logger, config)
domains = libvirtd.listDomains()
libvirt.assert_called_with("")
@patch('libvirt.openReadOnly')
def test_read_fail(self, virt):
- logger = logging.getLogger()
config = Config('test', 'libvirt')
- libvirtd = Virt.fromConfig(logger, config)
+ libvirtd = Virt.fromConfig(self.logger, config)
virt.side_effect = raiseLibvirtError
self.assertRaises(VirtError, libvirtd.listDomains)
diff --git a/tests/test_manager.py b/tests/test_manager.py
index f7377d7..8f777ae 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -25,7 +25,7 @@ import tempfile
import subprocess
from mock import patch, MagicMock, ANY
-from base import unittest
+from base import TestBase
from config import Config
from manager import Manager, ManagerError
@@ -36,7 +36,7 @@ import rhsm.connection
import xmlrpclib
-class TestManager(unittest.TestCase):
+class TestManager(TestBase):
""" Test of all available subscription managers. """
guestInfo = [
@@ -65,7 +65,6 @@ class TestSubscriptionManager(TestManager):
smType = "sam"
def prepare(self, create_from_file, connection):
- self.logger = logging.getLogger()
self.options = MagicMock()
self.options.smType = self.smType
@@ -108,20 +107,18 @@ class TestSatellite(TestManager):
smType = "satellite"
def test_sendVirtGuests(self):
- logger = logging.getLogger()
options = MagicMock()
options.smType = self.smType
- manager = Manager.fromOptions(logger, options)
+ manager = Manager.fromOptions(self.logger, options)
self.assertRaises(ManagerError, manager.sendVirtGuests, self.guestInfo)
@patch("xmlrpclib.Server")
def test_hypervisorCheckIn(self, server):
- logger = logging.getLogger()
options = MagicMock()
options.smType = self.smType
- manager = Manager.fromOptions(logger, options)
+ manager = Manager.fromOptions(self.logger, options)
options.env = "ENV"
options.owner = "OWNER"
manager.hypervisorCheckIn(options, self.mapping)
diff --git a/tests/test_password.py b/tests/test_password.py
index 7396e80..090a164 100644
--- a/tests/test_password.py
+++ b/tests/test_password.py
@@ -23,12 +23,12 @@ import tempfile
from binascii import hexlify, unhexlify
from mock import MagicMock
-from base import unittest
+from base import TestBase
from password import Password
-class TestPassword(unittest.TestCase):
+class TestPassword(TestBase):
def testEncrypt(self):
self.assertEqual(hexlify(
Password._crypt(
diff --git a/tests/test_satellite.py b/tests/test_satellite.py
index d493694..bb781e7 100644
--- a/tests/test_satellite.py
+++ b/tests/test_satellite.py
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
import os
import sys
-from base import unittest
+from base import TestBase
import logging
import threading
@@ -90,10 +90,10 @@ class Options(object):
self.password = password
-class TestSatellite(unittest.TestCase):
+class TestSatellite(TestBase):
@classmethod
def setUpClass(cls):
- cls.logger = logging.getLogger()
+ super(TestSatellite, cls).setUpClass()
cls.fake_server = FakeSatellite()
cls.thread = threading.Thread(target=cls.fake_server.serve_forever)
cls.thread.start()
diff --git a/tests/test_virtwho.py b/tests/test_virtwho.py
index 6e717b5..94cbb50 100644
--- a/tests/test_virtwho.py
+++ b/tests/test_virtwho.py
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
import sys
import os
-from base import unittest
+from base import TestBase
import logging
from mock import patch, Mock
@@ -31,7 +31,7 @@ from virt import VirtError
from manager import ManagerError
-class TestOptions(unittest.TestCase):
+class TestOptions(TestBase):
def setUp(self):
self.clearEnv()
@@ -94,38 +94,36 @@ class TestOptions(unittest.TestCase):
@patch('virt.Virt.fromConfig')
@patch('manager.Manager.fromOptions')
def test_sending_guests(self, fromOptions, fromConfig):
- logger = logging.getLogger()
options = Mock()
options.oneshot = True
- virtwho = VirtWho(logger, options)
+ virtwho = VirtWho(self.logger, options)
config = Config("test", "esx", "localhost",
"username", "password", "owner", "env")
virtwho.configManager.addConfig(config)
self.assertTrue(virtwho.send())
- fromConfig.assert_called_with(logger, config)
+ fromConfig.assert_called_with(self.logger, config)
self.assertTrue(fromConfig.return_value.getHostGuestMapping.called)
- fromOptions.assert_called_with(logger, options)
+ fromOptions.assert_called_with(self.logger, options)
@patch('virt.Virt.fromConfig')
@patch('manager.Manager.fromOptions')
def test_sending_guests_errors(self, fromOptions, fromConfig):
- logger = logging.getLogger()
options = Mock()
options.oneshot = True
- virtwho = VirtWho(logger, options)
+ virtwho = VirtWho(self.logger, options)
config = Config("test", "esx", "localhost",
"username", "password", "owner", "env")
virtwho.configManager.addConfig(config)
fromConfig.return_value.getHostGuestMapping.side_effect = VirtError
self.assertFalse(virtwho.send())
- fromConfig.assert_called_with(logger, config)
+ fromConfig.assert_called_with(self.logger, config)
self.assertTrue(fromConfig.return_value.getHostGuestMapping.called)
fromOptions.assert_not_called()
fromConfig.return_value.getHostGuestMapping.side_effect = None
fromOptions.return_value.hypervisorCheckIn.side_effect = ManagerError
self.assertFalse(virtwho.send())
- fromConfig.assert_called_with(logger, config)
+ fromConfig.assert_called_with(self.logger, config)
self.assertTrue(fromConfig.return_value.getHostGuestMapping.called)
fromOptions.assert_called()
self.assertTrue(fromOptions.return_value.hypervisorCheckIn.called)