Revision 31ccfc0e test/py/ganeti.client.gnt_cluster_unittest.py

b/test/py/ganeti.client.gnt_cluster_unittest.py
260 260
    self.assertEqual(result, constants.EXIT_FAILURE)
261 261

  
262 262

  
263
class InitDrbdHelper(unittest.TestCase):
263
class DrbdHelperTestCase(unittest.TestCase):
264 264

  
265 265
  def setUp(self):
266 266
    unittest.TestCase.setUp(self)
......
272 272
  def disableDrbd(self):
273 273
    self.enabled_disk_templates = [constants.DT_DISKLESS]
274 274

  
275

  
276
class InitDrbdHelper(DrbdHelperTestCase):
277

  
275 278
  def testNoDrbdNoHelper(self):
276 279
    opts = mock.Mock()
277 280
    opts.drbd_helper = None
......
308 311
    self.assertEquals(opts.drbd_helper, helper)
309 312

  
310 313

  
311
class GetDrbdHelper(unittest.TestCase):
314
class GetDrbdHelper(DrbdHelperTestCase):
312 315

  
313 316
  def testNoDrbdNoHelper(self):
314 317
    opts = mock.Mock()
315
    opts.drbd_storage = False
318
    self.disableDrbd()
319
    opts.drbd_helper = None
320
    helper = gnt_cluster._GetDrbdHelper(opts, self.enabled_disk_templates)
321
    self.assertEquals(None, helper)
322

  
323
  def testNoTemplateInfoNoHelper(self):
324
    opts = mock.Mock()
316 325
    opts.drbd_helper = None
317
    helper = gnt_cluster._GetDrbdHelper(opts)
318
    self.assertEquals("", helper)
326
    helper = gnt_cluster._GetDrbdHelper(opts, None)
327
    self.assertEquals(None, helper)
328

  
329
  def testNoTemplateInfoHelper(self):
330
    opts = mock.Mock()
331
    opts.drbd_helper = "/bin/true"
332
    helper = gnt_cluster._GetDrbdHelper(opts, None)
333
    self.assertEquals(opts.drbd_helper, helper)
319 334

  
320 335
  def testNoDrbdHelper(self):
321 336
    opts = mock.Mock()
322
    opts.drbd_storage = None
337
    self.disableDrbd()
323 338
    opts.drbd_helper = "/bin/true"
324
    self.assertRaises(errors.OpPrereqError, gnt_cluster._GetDrbdHelper, opts)
339
    self.assertRaises(errors.OpPrereqError, gnt_cluster._GetDrbdHelper, opts,
340
        self.enabled_disk_templates)
325 341

  
326 342
  def testDrbdNoHelper(self):
327 343
    opts = mock.Mock()
328
    opts.drbd_storage = True
344
    self.enableDrbd()
329 345
    opts.drbd_helper = None
330
    helper = gnt_cluster._GetDrbdHelper(opts)
346
    helper = gnt_cluster._GetDrbdHelper(opts, self.enabled_disk_templates)
331 347
    self.assertEquals(None, helper)
332 348

  
333 349
  def testDrbdHelper(self):
334 350
    opts = mock.Mock()
335
    opts.drbd_storage = True
351
    self.enableDrbd()
336 352
    opts.drbd_helper = "/bin/true"
337
    helper = gnt_cluster._GetDrbdHelper(opts)
353
    helper = gnt_cluster._GetDrbdHelper(opts, self.enabled_disk_templates)
338 354
    self.assertEquals(opts.drbd_helper, helper)
339 355

  
340 356

  

Also available in: Unified diff