Revision 149a5439 test/ganeti.bdev_unittest.py

b/test/ganeti.bdev_unittest.py
25 25
import os
26 26
import unittest
27 27

  
28
import testutils
28 29
from ganeti import bdev
29 30
from ganeti import errors
30 31

  
31 32

  
32
class TestDRBD8Runner(unittest.TestCase):
33
class TestDRBD8Runner(testutils.GanetiTestCase):
33 34
  """Testing case for DRBD8"""
34 35

  
35 36
  @staticmethod
......
46 47
    return retval
47 48

  
48 49
  @staticmethod
49
  def _get_contents(name):
50
    """Returns the contents of a file"""
51

  
52
    prefix = os.environ.get("srcdir", None)
53
    if prefix:
54
      name = prefix + "/test/" + name
55
    fh = open(name, "r")
56
    try:
57
      data = fh.read()
58
    finally:
59
      fh.close()
60
    return data
61

  
62
  @staticmethod
63 50
  def _has_net(data, local, remote):
64 51
    """Check network connection parameters"""
65 52
    retval = (
......
76 63

  
77 64
  def testParserBoth(self):
78 65
    """Test drbdsetup show parser for disk and network"""
79
    data = self._get_contents("data/bdev-both.txt")
66
    data = self._ReadTestData("bdev-both.txt")
80 67
    result = bdev.DRBD8._GetDevInfo(data)
81 68
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
82 69
                                   "/dev/xenvg/test.meta"),
......
87 74

  
88 75
  def testParserNet(self):
89 76
    """Test drbdsetup show parser for disk and network"""
90
    data = self._get_contents("data/bdev-net.txt")
77
    data = self._ReadTestData("bdev-net.txt")
91 78
    result = bdev.DRBD8._GetDevInfo(data)
92 79
    self.failUnless(("local_dev" not in result and
93 80
                     "meta_dev" not in result and
......
99 86

  
100 87
  def testParserDisk(self):
101 88
    """Test drbdsetup show parser for disk and network"""
102
    data = self._get_contents("data/bdev-disk.txt")
89
    data = self._ReadTestData("bdev-disk.txt")
103 90
    result = bdev.DRBD8._GetDevInfo(data)
104 91
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
105 92
                                   "/dev/xenvg/test.meta"),
......
109 96
                    "Should not find network info")
110 97

  
111 98

  
112
class TestDRBD8Status(unittest.TestCase):
99
class TestDRBD8Status(testutils.GanetiTestCase):
113 100
  """Testing case for DRBD8 /proc status"""
114 101

  
115 102
  def setUp(self):
116 103
    """Read in txt data"""
117
    proc_data = "test/data/proc_drbd8.txt"
118
    prefix = os.environ.get("srcdir", None)
119
    if prefix:
120
      proc_data = prefix + "/" + proc_data
104
    proc_data = self._TestDataFilename("proc_drbd8.txt")
121 105
    self.proc_data = bdev.DRBD8._GetProcData(filename=proc_data)
122 106
    self.mass_data = bdev.DRBD8._MassageProcData(self.proc_data)
123 107

  

Also available in: Unified diff