Revision 51129a7f

b/test/ganeti.hypervisor.hv_kvm_unittest.py
42 42
  """Stub for a QMP endpoint for a KVM instance
43 43

  
44 44
  """
45
  _QMP_BANNER_DATA = {"QMP": {"version": {
46
                      "package": "",
47
                      "qemu": {"micro": 50, "minor": 13, "major": 0},
48
                      "capabilities": [],
49
                      }}}
50
  _EMPTY_RESPONSE = {"return": []}
45
  _QMP_BANNER_DATA = {
46
    "QMP": {
47
      "version": {
48
        "package": "",
49
        "qemu": {
50
          "micro": 50,
51
          "minor": 13,
52
          "major": 0,
53
          },
54
        "capabilities": [],
55
        },
56
      }
57
    }
58
  _EMPTY_RESPONSE = {
59
    "return": [],
60
    }
51 61

  
52 62
  def __init__(self, socket_filename, server_responses):
53 63
    """Creates a QMP stub
......
107 117

  
108 118
class TestQmpMessage(testutils.GanetiTestCase):
109 119
  def testSerialization(self):
110
    test_data = {"execute": "command", "arguments": ["a", "b", "c"]}
120
    test_data = {
121
      "execute": "command",
122
      "arguments": ["a", "b", "c"],
123
      }
111 124
    message = hv_kvm.QmpMessage(test_data)
112 125

  
113 126
    for k, v in test_data.items():
114
      self.failUnless(message[k] == v)
127
      self.assertEqual(message[k], v)
128

  
129
    serialized = str(message)
130
    self.assertEqual(len(serialized.splitlines()), 1,
131
                     msg="Got multi-line message")
115 132

  
116
    rebuilt_message = hv_kvm.QmpMessage.BuildFromJsonString(str(message))
117
    self.failUnless(rebuilt_message == message)
133
    rebuilt_message = hv_kvm.QmpMessage.BuildFromJsonString(serialized)
134
    self.assertEqual(rebuilt_message, message)
118 135

  
119 136

  
120 137
class TestQmp(testutils.GanetiTestCase):
......
158 175
    # Format the script
159 176
    for request, expected_response in zip(requests, expected_responses):
160 177
      response = qmp_connection.Execute(request)
161
      self.failUnless(response == hv_kvm.QmpMessage(expected_response))
178
      msg = hv_kvm.QmpMessage(expected_response)
179
      self.assertEqual(len(str(msg).splitlines()), 1,
180
                       msg="Got multi-line message")
181
      self.assertEqual(response, msg)
162 182

  
163 183

  
164 184
class TestConsole(unittest.TestCase):

Also available in: Unified diff