Revision 8e4968ca test/py/ganeti.opcodes_unittest.py

b/test/py/ganeti.opcodes_unittest.py
197 197
      # Check parameter definitions
198 198
      for attr_name, aval, test, doc in cls.GetAllParams():
199 199
        self.assert_(attr_name)
200
        self.assert_(test is None or test is ht.NoType or callable(test),
200
        self.assertTrue(callable(test),
201 201
                     msg=("Invalid type check for %s.%s" %
202 202
                          (cls.OP_ID, attr_name)))
203 203
        self.assertTrue(doc is None or isinstance(doc, basestring))
......
214 214

  
215 215
          default_value = aval
216 216

  
217
        if aval is not ht.NoDefault and test is not ht.NoType:
217
        if aval is not ht.NoDefault and aval is not None:
218 218
          self.assertTrue(test(default_value),
219 219
                          msg=("Default value of %s.%s does not verify" %
220 220
                               (cls.OP_ID, attr_name)))
......
230 230
        ("nodef", ht.NoDefault, ht.TMaybeString, None),
231 231
        ("wdef", "default", ht.TMaybeString, None),
232 232
        ("number", 0, ht.TInt, None),
233
        ("notype", None, ht.NoType, None),
233
        ("notype", None, ht.TAny, None),
234 234
        ]
235 235

  
236 236
    # Missing required parameter "nodef"

Also available in: Unified diff