Revision 00ef625c test/py/ganeti.bdev_unittest.py

b/test/py/ganeti.bdev_unittest.py
106 106

  
107 107
  def testParser80(self):
108 108
    """Test drbdsetup show parser for disk and network version 8.0"""
109
    data = self._ReadTestData("bdev-drbd-8.0.txt")
109
    data = testutils.ReadTestData("bdev-drbd-8.0.txt")
110 110
    result = bdev.DRBD8._GetDevInfo(data)
111 111
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
112 112
                                   "/dev/xenvg/test.meta"),
......
117 117

  
118 118
  def testParser83(self):
119 119
    """Test drbdsetup show parser for disk and network version 8.3"""
120
    data = self._ReadTestData("bdev-drbd-8.3.txt")
120
    data = testutils.ReadTestData("bdev-drbd-8.3.txt")
121 121
    result = bdev.DRBD8._GetDevInfo(data)
122 122
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
123 123
                                   "/dev/xenvg/test.meta"),
......
128 128

  
129 129
  def testParserNetIP4(self):
130 130
    """Test drbdsetup show parser for IPv4 network"""
131
    data = self._ReadTestData("bdev-drbd-net-ip4.txt")
131
    data = testutils.ReadTestData("bdev-drbd-net-ip4.txt")
132 132
    result = bdev.DRBD8._GetDevInfo(data)
133 133
    self.failUnless(("local_dev" not in result and
134 134
                     "meta_dev" not in result and
......
140 140

  
141 141
  def testParserNetIP6(self):
142 142
    """Test drbdsetup show parser for IPv6 network"""
143
    data = self._ReadTestData("bdev-drbd-net-ip6.txt")
143
    data = testutils.ReadTestData("bdev-drbd-net-ip6.txt")
144 144
    result = bdev.DRBD8._GetDevInfo(data)
145 145
    self.failUnless(("local_dev" not in result and
146 146
                     "meta_dev" not in result and
......
152 152

  
153 153
  def testParserDisk(self):
154 154
    """Test drbdsetup show parser for disk"""
155
    data = self._ReadTestData("bdev-drbd-disk.txt")
155
    data = testutils.ReadTestData("bdev-drbd-disk.txt")
156 156
    result = bdev.DRBD8._GetDevInfo(data)
157 157
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
158 158
                                   "/dev/xenvg/test.meta"),
......
237 237
  def setUp(self):
238 238
    """Read in txt data"""
239 239
    testutils.GanetiTestCase.setUp(self)
240
    proc_data = self._TestDataFilename("proc_drbd8.txt")
241
    proc80e_data = self._TestDataFilename("proc_drbd80-emptyline.txt")
242
    proc83_data = self._TestDataFilename("proc_drbd83.txt")
243
    proc83_sync_data = self._TestDataFilename("proc_drbd83_sync.txt")
240
    proc_data = testutils.TestDataFilename("proc_drbd8.txt")
241
    proc80e_data = testutils.TestDataFilename("proc_drbd80-emptyline.txt")
242
    proc83_data = testutils.TestDataFilename("proc_drbd83.txt")
243
    proc83_sync_data = testutils.TestDataFilename("proc_drbd83_sync.txt")
244 244
    proc83_sync_krnl_data = \
245
      self._TestDataFilename("proc_drbd83_sync_krnl2.6.39.txt")
245
      testutils.TestDataFilename("proc_drbd83_sync_krnl2.6.39.txt")
246 246
    self.proc_data = bdev.DRBD8._GetProcData(filename=proc_data)
247 247
    self.proc80e_data = bdev.DRBD8._GetProcData(filename=proc80e_data)
248 248
    self.proc83_data = bdev.DRBD8._GetProcData(filename=proc83_data)
......
265 265

  
266 266
  def testHelper(self):
267 267
    """Test reading usermode_helper in /sys."""
268
    sys_drbd_helper = self._TestDataFilename("sys_drbd_usermode_helper.txt")
268
    sys_drbd_helper = testutils.TestDataFilename("sys_drbd_usermode_helper.txt")
269 269
    drbd_helper = bdev.DRBD8.GetUsermodeHelper(filename=sys_drbd_helper)
270 270
    self.failUnlessEqual(drbd_helper, "/bin/true")
271 271

  

Also available in: Unified diff