Revision b705c7a6 test/ganeti.netutils_unittest.py

b/test/ganeti.netutils_unittest.py
102 102
    self.assertEqual(gid, os.getgid())
103 103

  
104 104

  
105
class TestHostInfo(unittest.TestCase):
106
  """Testing case for HostInfo"""
105
class TestHostname(unittest.TestCase):
106
  """Testing case for Hostname"""
107 107

  
108 108
  def testUppercase(self):
109 109
    data = "AbC.example.com"
110
    self.failUnlessEqual(netutils.HostInfo.NormalizeName(data), data.lower())
110
    self.assertEqual(netutils.Hostname.GetNormalizedName(data), data.lower())
111 111

  
112 112
  def testTooLongName(self):
113 113
    data = "a.b." + "c" * 255
114
    self.failUnlessRaises(errors.OpPrereqError,
115
                          netutils.HostInfo.NormalizeName, data)
114
    self.assertRaises(errors.OpPrereqError,
115
                      netutils.Hostname.GetNormalizedName, data)
116 116

  
117 117
  def testTrailingDot(self):
118 118
    data = "a.b.c"
119
    self.failUnlessEqual(netutils.HostInfo.NormalizeName(data + "."), data)
119
    self.assertEqual(netutils.Hostname.GetNormalizedName(data + "."), data)
120 120

  
121 121
  def testInvalidName(self):
122 122
    data = [
......
126 126
      "a..b",
127 127
      ]
128 128
    for value in data:
129
      self.failUnlessRaises(errors.OpPrereqError,
130
                            netutils.HostInfo.NormalizeName, value)
129
      self.assertRaises(errors.OpPrereqError,
130
                        netutils.Hostname.GetNormalizedName, value)
131 131

  
132 132
  def testValidName(self):
133 133
    data = [
......
137 137
      "a.b.c",
138 138
      ]
139 139
    for value in data:
140
      netutils.HostInfo.NormalizeName(value)
140
      self.assertEqual(netutils.Hostname.GetNormalizedName(value), value)
141 141

  
142 142

  
143 143
class TestIPAddress(unittest.TestCase):

Also available in: Unified diff