Replaced mox with mock in test_loguserdata

Also fixed a bug in loguserdata for an incorrect tuple instantiation

Change-Id: Ic7bcf018b771505e3ef6c747e0624f929463eb5b
This commit is contained in:
Jay Dobies 2015-10-09 15:45:00 -04:00
parent a8ece6e7dd
commit 9ff5437e72
2 changed files with 114 additions and 117 deletions

View File

@ -42,7 +42,7 @@ def chk_ci_version():
raise Exception() raise Exception()
# data[1] has such format: 'cloud-init 0.7.5\n', need to parse version # data[1] has such format: 'cloud-init 0.7.5\n', need to parse version
v = re.split(' |\n', data[1])[1].split('.') v = re.split(' |\n', data[1])[1].split('.')
return tuple(v) >= tuple('0', '6', '0') return tuple(v) >= tuple(['0', '6', '0'])
def init_logging(): def init_logging():

View File

@ -15,158 +15,155 @@ import errno
import os import os
import subprocess import subprocess
import mox import mock
import pkg_resources import unittest
import six
from heat.cloudinit import loguserdata from heat.cloudinit import loguserdata
from heat.tests import common
class FakeCiVersion(object): class FakeCiVersion(object):
def __init__(self, version=None): def __init__(self, version):
self.version = version self.version = version
class FakePOpen(object): class LoguserdataTest(unittest.TestCase):
def __init__(self, returncode=0):
self.returncode = returncode
def wait(self): @mock.patch('pkg_resources.get_distribution')
pass def test_ci_version_with_pkg_resources(self, mock_get):
# Setup
def communicate(self, input=None): returned_versions = [
pass FakeCiVersion('0.5.0'),
FakeCiVersion('0.5.9'),
FakeCiVersion('0.6.0'),
class LoguserdataTest(common.HeatTestCase): FakeCiVersion('0.7.0'),
FakeCiVersion('1.0'),
def setUp(self): FakeCiVersion('2.0'),
super(LoguserdataTest, self).setUp() ]
self.m.StubOutWithMock(pkg_resources, 'get_distribution') mock_get.side_effect = returned_versions
self.m.StubOutWithMock(subprocess, 'Popen')
self.m.StubOutWithMock(os, 'chmod')
def test_ci_version(self):
# too old versions
pkg_resources.get_distribution('cloud-init').AndReturn(
FakeCiVersion('0.5.0'))
pkg_resources.get_distribution('cloud-init').AndReturn(
FakeCiVersion('0.5.9'))
# new enough versions
pkg_resources.get_distribution('cloud-init').AndReturn(
FakeCiVersion('0.6.0'))
pkg_resources.get_distribution('cloud-init').AndReturn(
FakeCiVersion('0.7.0'))
pkg_resources.get_distribution('cloud-init').AndReturn(
FakeCiVersion('1.0'))
pkg_resources.get_distribution('cloud-init').AndReturn(
FakeCiVersion('2.0'))
self.m.ReplayAll()
# Test & Verify
self.assertFalse(loguserdata.chk_ci_version()) self.assertFalse(loguserdata.chk_ci_version())
self.assertFalse(loguserdata.chk_ci_version()) self.assertFalse(loguserdata.chk_ci_version())
self.assertTrue(loguserdata.chk_ci_version()) self.assertTrue(loguserdata.chk_ci_version())
self.assertTrue(loguserdata.chk_ci_version()) self.assertTrue(loguserdata.chk_ci_version())
self.assertTrue(loguserdata.chk_ci_version()) self.assertTrue(loguserdata.chk_ci_version())
self.assertTrue(loguserdata.chk_ci_version()) self.assertTrue(loguserdata.chk_ci_version())
self.assertEqual(6, mock_get.call_count)
self.m.VerifyAll() @mock.patch('pkg_resources.get_distribution')
@mock.patch('subprocess.Popen')
def test_ci_version_with_subprocess(self, mock_popen,
mock_get_distribution):
# Setup
mock_get_distribution.side_effect = Exception()
def test_call(self): popen_return = [
subprocess.Popen( [None, 'cloud-init 0.0.5\n'],
['echo', 'hi'], [None, 'cloud-init 0.7.5\n'],
stderr=mox.IgnoreArg(), ]
stdout=mox.IgnoreArg()).AndReturn(FakePOpen(0)) mock_popen.return_value = mock.MagicMock()
mock_popen.return_value.communicate.side_effect = popen_return
self.m.ReplayAll() # Test & Verify
self.assertEqual(0, loguserdata.call(['echo', 'hi'])) self.assertFalse(loguserdata.chk_ci_version())
self.m.VerifyAll() self.assertTrue(loguserdata.chk_ci_version())
self.assertEqual(2, mock_get_distribution.call_count)
def test_main(self): @mock.patch('pkg_resources.get_distribution')
@mock.patch('subprocess.Popen')
def test_ci_version_with_subprocess_exception(self, mock_popen,
mock_get_distribution):
# Setup
mock_get_distribution.side_effect = Exception()
mock_popen.return_value = mock.MagicMock()
mock_popen.return_value.communicate.return_value = ['non-empty',
'irrelevant']
pkg_resources.get_distribution('cloud-init').AndReturn( # Test
FakeCiVersion('0.7.0')) self.assertRaises(Exception, loguserdata.chk_ci_version) # noqa
self.assertEqual(1, mock_get_distribution.call_count)
os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None) @mock.patch('subprocess.Popen')
subprocess.Popen( def test_call(self, mock_popen):
['/var/lib/heat-cfntools/cfn-userdata'], # Setup
stderr=mox.IgnoreArg(), mock_popen.return_value = mock.MagicMock()
stdout=mox.IgnoreArg()).AndReturn(FakePOpen(0)) mock_popen.return_value.communicate.return_value = ['a', 'b']
mock_popen.return_value.returncode = 0
self.m.ReplayAll() # Test
loguserdata.main() return_code = loguserdata.call(['foo', 'bar'])
self.m.VerifyAll()
def test_main_script_empty(self): # Verify
mock_popen.assert_called_once_with(['foo', 'bar'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
self.assertEqual(0, return_code)
pkg_resources.get_distribution('cloud-init').AndReturn( @mock.patch('sys.exc_info')
FakeCiVersion('0.7.0')) @mock.patch('subprocess.Popen')
def test_call_oserror_enoexec(self, mock_popen, mock_exc_info):
# Setup
mock_popen.side_effect = OSError()
no_exec = mock.MagicMock(errno=errno.ENOEXEC)
mock_exc_info.return_value = None, no_exec, None
os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None) # Test
subprocess.Popen( return_code = loguserdata.call(['foo', 'bar'])
['/var/lib/heat-cfntools/cfn-userdata'],
stderr=mox.IgnoreArg(),
stdout=mox.IgnoreArg()).AndRaise(
OSError(errno.ENOEXEC, "empty script"))
self.m.ReplayAll() # Verify
self.assertIsNone(loguserdata.main()) self.assertEqual(os.EX_OK, return_code)
self.m.VerifyAll() @mock.patch('sys.exc_info')
@mock.patch('subprocess.Popen')
def test_call_oserror_other(self, mock_popen, mock_exc_info):
# Setup
mock_popen.side_effect = OSError()
no_exec = mock.MagicMock(errno='foo')
mock_exc_info.return_value = None, no_exec, None
def test_main_os_error(self): # Test
return_code = loguserdata.call(['foo', 'bar'])
pkg_resources.get_distribution('cloud-init').AndReturn( # Verify
FakeCiVersion('0.7.0')) self.assertEqual(os.EX_OSERR, return_code)
os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None) @mock.patch('sys.exc_info')
subprocess.Popen( @mock.patch('subprocess.Popen')
['/var/lib/heat-cfntools/cfn-userdata'], def test_call_exception(self, mock_popen, mock_exc_info):
stderr=mox.IgnoreArg(), # Setup
stdout=mox.IgnoreArg()).AndRaise( mock_popen.side_effect = Exception()
OSError(errno.ENOENT, "no such file")) no_exec = mock.MagicMock(errno='irrelevant')
mock_exc_info.return_value = None, no_exec, None
self.m.ReplayAll() # Test
self.assertEqual(os.EX_OSERR, loguserdata.main()) return_code = loguserdata.call(['foo', 'bar'])
self.m.VerifyAll() # Verify
self.assertEqual(os.EX_SOFTWARE, return_code)
def test_main_error_other(self): @mock.patch('pkg_resources.get_distribution')
pkg_resources.get_distribution('cloud-init').AndReturn( @mock.patch('os.chmod')
FakeCiVersion('0.7.0')) @mock.patch('heat.cloudinit.loguserdata.call')
os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None) def test_main(self, mock_call, mock_chmod, mock_get):
subprocess.Popen( # Setup
['/var/lib/heat-cfntools/cfn-userdata'], mock_get.return_value = FakeCiVersion('1.0')
stderr=mox.IgnoreArg(), mock_call.return_value = 10
stdout=mox.IgnoreArg()).AndRaise(IOError("read failed"))
self.m.ReplayAll() # Test
if six.PY3: return_code = loguserdata.main()
self.assertEqual(os.EX_OSERR, loguserdata.main())
else:
self.assertEqual(os.EX_SOFTWARE, loguserdata.main())
self.m.VerifyAll()
def test_main_fails(self): # Verify
expected_path = os.path.join(loguserdata.VAR_PATH, 'cfn-userdata')
mock_chmod.assert_called_once_with(expected_path, int('700', 8))
self.assertEqual(10, return_code)
# fail on ci version @mock.patch('pkg_resources.get_distribution')
pkg_resources.get_distribution('cloud-init').AndReturn( def test_main_failed_ci_version(self, mock_get):
FakeCiVersion('0.5.0')) # Setup
# fail on execute cfn-userdata mock_get.return_value = FakeCiVersion('0.0.0')
pkg_resources.get_distribution('cloud-init').AndReturn(
FakeCiVersion('0.7.0'))
os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None) # Test
subprocess.Popen( return_code = loguserdata.main()
['/var/lib/heat-cfntools/cfn-userdata'],
stderr=mox.IgnoreArg(),
stdout=mox.IgnoreArg()).AndReturn(FakePOpen(-2))
self.m.ReplayAll() # Verify
self.assertEqual(-1, loguserdata.main()) self.assertEqual(-1, return_code)
self.assertEqual(-2, loguserdata.main())
self.m.VerifyAll()