Commit 5859dad6 authored by Helga Velroyen's avatar Helga Velroyen
Browse files

Move orphaned unit tests to cmdlib/cluster_unittest.py



Through some merge from 2.9 to master, some unit tests
in the file ganeti.comdlib.common_unittest.py were
no longer referenced in the Makefile and as such not
run anymore. With the introduction of the cmdlib test
suite and the following extension of the unit tests,
the orphaned unit tests (which are not already subsumed
by others) are moved into the new unit test files.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent f505e3ee
......@@ -815,6 +815,13 @@ class TestLUClusterSetParams(CmdlibTestCase):
self.assertEqual(enabled_disk_templates,
self.cluster.enabled_disk_templates)
def testEnabledDiskTemplatesVsIpolicy(self):
enabled_disk_templates = [constants.DT_DISKLESS, constants.DT_PLAIN]
op = opcodes.OpClusterSetParams(
enabled_disk_templates=enabled_disk_templates,
ipolicy={constants.IPOLICY_DTS: [constants.DT_FILE]})
self.ExecOpCodeExpectOpPrereqError(op, "but not enabled on the cluster")
def testDisablingDiskTemplatesOfInstances(self):
old_disk_templates = [constants.DT_DISKLESS, constants.DT_PLAIN]
self.cfg.SetEnabledDiskTemplates(old_disk_templates)
......
#!/usr/bin/python
#
# Copyright (C) 2013 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
"""Script for unittesting the cmdlib module 'common'"""
import unittest
from ganeti.cmdlib import common
from ganeti import constants
from ganeti import errors
import testutils
class TestCheckIpolicy(unittest.TestCase):
def testAllTemplatesEnabled(self):
allowed_disk_templates = [constants.DT_PLAIN]
ipolicy = {constants.IPOLICY_DTS: allowed_disk_templates}
enabled_disk_templates = [constants.DT_PLAIN, constants.DT_DRBD8]
common.CheckIpolicyVsDiskTemplates(
ipolicy, enabled_disk_templates)
def testSomeTemplatesUnenabled(self):
allowed_disk_templates = [constants.DT_PLAIN, constants.DT_DISKLESS]
ipolicy = {constants.IPOLICY_DTS: allowed_disk_templates}
enabled_disk_templates = [constants.DT_PLAIN, constants.DT_DRBD8]
self.assertRaises(
errors.OpPrereqError,
common.CheckIpolicyVsDiskTemplates,
ipolicy, enabled_disk_templates)
if __name__ == "__main__":
testutils.GanetiTestProgram()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment