Merge branch 'stable-2.8' into stable-2.9

[ganeti-local] / test / py / ganeti.constants_unittest.py

diff --git a/test/py/ganeti.constants_unittest.py b/test/py/ganeti.constants_unittest.py
index 3139d7d..cb1cdf1 100755 (executable)
--- a/test/py/ganeti.constants_unittest.py
+++ b/test/py/ganeti.constants_unittest.py
@@ -80,8 +80,9 @@ class TestConstants(unittest.TestCase):
     self.failUnless(constants.OP_PRIO_HIGH > constants.OP_PRIO_HIGHEST)
 
   def testDiskDefaults(self):
-    self.failUnless(set(constants.DISK_LD_DEFAULTS.keys()) ==
-                    constants.LOGICAL_DISK_TYPES)
+    self.failUnless(
+        set(constants.DISK_LD_DEFAULTS.keys()) ==
+        set(constants.DISK_TEMPLATES) - set([constants.DT_DISKLESS]))
     self.failUnless(set(constants.DISK_DT_DEFAULTS.keys()) ==
                     constants.DISK_TEMPLATES)