Revision a9e1819b test/py/ganeti.opcodes_unittest.py

b/test/py/ganeti.opcodes_unittest.py
219 219
    op = OpTest()
220 220
    before = op.__getstate__()
221 221
    self.assertRaises(errors.OpPrereqError, op.Validate, False)
222
    self.assertFalse(hasattr(op, "nodef"))
223
    self.assertFalse(hasattr(op, "wdef"))
224
    self.assertFalse(hasattr(op, "number"))
225
    self.assertFalse(hasattr(op, "notype"))
222
    self.assertTrue(op.nodef is None)
223
    self.assertEqual(op.wdef, "default")
224
    self.assertEqual(op.number, 0)
225
    self.assertTrue(op.notype is None)
226 226
    self.assertEqual(op.__getstate__(), before, msg="Opcode was modified")
227 227

  
228 228
    # Required parameter "nodef" is provided
......
231 231
    op.Validate(False)
232 232
    self.assertEqual(op.__getstate__(), before, msg="Opcode was modified")
233 233
    self.assertEqual(op.nodef, "foo")
234
    self.assertFalse(hasattr(op, "wdef"))
235
    self.assertFalse(hasattr(op, "number"))
236
    self.assertFalse(hasattr(op, "notype"))
234
    self.assertEqual(op.wdef, "default")
235
    self.assertEqual(op.number, 0)
236
    self.assertTrue(op.notype is None)
237 237

  
238 238
    # Missing required parameter "nodef"
239 239
    op = OpTest(wdef="hello", number=999)
240 240
    before = op.__getstate__()
241 241
    self.assertRaises(errors.OpPrereqError, op.Validate, False)
242
    self.assertFalse(hasattr(op, "nodef"))
243
    self.assertFalse(hasattr(op, "notype"))
242
    self.assertTrue(op.nodef is None)
243
    self.assertTrue(op.notype is None)
244 244
    self.assertEqual(op.__getstate__(), before, msg="Opcode was modified")
245 245

  
246 246
    # Wrong type for "nodef"
......
248 248
    before = op.__getstate__()
249 249
    self.assertRaises(errors.OpPrereqError, op.Validate, False)
250 250
    self.assertEqual(op.nodef, 987)
251
    self.assertFalse(hasattr(op, "notype"))
251
    self.assertTrue(op.notype is None)
252 252
    self.assertEqual(op.__getstate__(), before, msg="Opcode was modified")
253 253

  
254 254
    # Testing different types for "notype"
......
274 274
        ]
275 275

  
276 276
    op = OpTest()
277
    before = op.__getstate__()
278 277
    op.Validate(True)
279
    self.assertNotEqual(op.__getstate__(), before,
280
                        msg="Opcode was not modified")
281 278
    self.assertEqual(op.value1, "default")
282 279
    self.assertEqual(op.value2, "result")
283 280
    self.assert_(op.dry_run is None)
......
285 282
    self.assertEqual(op.priority, constants.OP_PRIO_DEFAULT)
286 283

  
287 284
    op = OpTest(value1="hello", value2="world", debug_level=123)
288
    before = op.__getstate__()
289 285
    op.Validate(True)
290
    self.assertNotEqual(op.__getstate__(), before,
291
                        msg="Opcode was not modified")
292 286
    self.assertEqual(op.value1, "hello")
293 287
    self.assertEqual(op.value2, "world")
294 288
    self.assertEqual(op.debug_level, 123)

Also available in: Unified diff