Revision 94e252a3 test/py/ganeti.cmdlib_unittest.py

b/test/py/ganeti.cmdlib_unittest.py
23 23

  
24 24

  
25 25
import os
26
import re
26 27
import unittest
27 28
import tempfile
28 29
import shutil
......
1325 1326
        disk_template, file_storage_dir="/tmp",
1326 1327
        file_driver=constants.FD_BLKTAP)
1327 1328

  
1328
      self.assertEqual(map(operator.attrgetter("logical_id"), result), [
1329
        (constants.FD_BLKTAP, "/tmp/disk2"),
1330
        (constants.FD_BLKTAP, "/tmp/disk3"),
1331
        (constants.FD_BLKTAP, "/tmp/disk4"),
1332
        ])
1329
      for (idx, disk) in enumerate(result):
1330
        (file_driver, file_storage_dir) = disk.logical_id
1331
        dir_fmt = r"^/tmp/.*\.%s\.disk%d$" % (disk_template, idx + 2)
1332
        self.assertEqual(file_driver, constants.FD_BLKTAP)
1333
        # FIXME: use assertIsNotNone when py 2.7 is minimum supported version
1334
        self.assertNotEqual(re.match(dir_fmt, file_storage_dir), None)
1333 1335

  
1334 1336
  def testBlock(self):
1335 1337
    disk_info = [{

Also available in: Unified diff