Revision efa6dd08 test/py/ganeti.block.bdev_unittest.py

b/test/py/ganeti.block.bdev_unittest.py
245 245
    proc83_sync_data = testutils.TestDataFilename("proc_drbd83_sync.txt")
246 246
    proc83_sync_krnl_data = \
247 247
      testutils.TestDataFilename("proc_drbd83_sync_krnl2.6.39.txt")
248
    proc84_data = testutils.TestDataFilename("proc_drbd84.txt")
249
    proc84_sync_data = testutils.TestDataFilename("proc_drbd84_sync.txt")
248 250

  
249 251
    self.proc80ev_data = \
250 252
      testutils.TestDataFilename("proc_drbd80-emptyversion.txt")
......
256 258
      drbd.DRBD8Info.CreateFromFile(filename=proc83_sync_data)
257 259
    self.drbd_info83_sync_krnl = \
258 260
      drbd.DRBD8Info.CreateFromFile(filename=proc83_sync_krnl_data)
261
    self.drbd_info84 = drbd.DRBD8Info.CreateFromFile(filename=proc84_data)
262
    self.drbd_info84_sync = \
263
      drbd.DRBD8Info.CreateFromFile(filename=proc84_sync_data)
259 264

  
260 265
  def testIOErrors(self):
261 266
    """Test handling of errors while reading the proc file."""
......
289 294

  
290 295
  def testMinor0(self):
291 296
    """Test connected, primary device"""
292
    for info in [self.drbd_info, self.drbd_info83]:
297
    for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
293 298
      stats = info.GetMinorStatus(0)
294 299
      self.failUnless(stats.is_in_use)
295 300
      self.failUnless(stats.is_connected and stats.is_primary and
......
297 302

  
298 303
  def testMinor1(self):
299 304
    """Test connected, secondary device"""
300
    for info in [self.drbd_info, self.drbd_info83]:
305
    for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
301 306
      stats = info.GetMinorStatus(1)
302 307
      self.failUnless(stats.is_in_use)
303 308
      self.failUnless(stats.is_connected and stats.is_secondary and
......
305 310

  
306 311
  def testMinor2(self):
307 312
    """Test unconfigured device"""
308
    for info in [self.drbd_info, self.drbd_info83, self.drbd_info80e]:
313
    for info in [self.drbd_info, self.drbd_info83,
314
                 self.drbd_info80e, self.drbd_info84]:
309 315
      stats = info.GetMinorStatus(2)
310 316
      self.failIf(stats.is_in_use)
311 317

  
312 318
  def testMinor4(self):
313 319
    """Test WFconn device"""
314
    for info in [self.drbd_info, self.drbd_info83]:
320
    for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
315 321
      stats = info.GetMinorStatus(4)
316 322
      self.failUnless(stats.is_in_use)
317 323
      self.failUnless(stats.is_wfconn and stats.is_primary and
......
320 326

  
321 327
  def testMinor6(self):
322 328
    """Test diskless device"""
323
    for info in [self.drbd_info, self.drbd_info83]:
329
    for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
324 330
      stats = info.GetMinorStatus(6)
325 331
      self.failUnless(stats.is_in_use)
326 332
      self.failUnless(stats.is_connected and stats.is_secondary and
......
328 334

  
329 335
  def testMinor8(self):
330 336
    """Test standalone device"""
331
    for info in [self.drbd_info, self.drbd_info83]:
337
    for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
332 338
      stats = info.GetMinorStatus(8)
333 339
      self.failUnless(stats.is_in_use)
334 340
      self.failUnless(stats.is_standalone and
......
345 351
    self.failUnless(stats.is_in_resync)
346 352
    self.failUnless(stats.sync_percent is not None)
347 353

  
354
  def testDRBD84Sync(self):
355
    stats = self.drbd_info84_sync.GetMinorStatus(5)
356
    self.failUnless(stats.is_in_resync)
357
    self.failUnless(stats.sync_percent is not None)
358

  
348 359
  def testDRBDEmptyVersion(self):
349 360
    self.assertRaises(errors.BlockDeviceError,
350 361
                      drbd.DRBD8Info.CreateFromFile,

Also available in: Unified diff