-
Iustin Pop authored
Commit e687ec01 (present in 2.5 since the 2.5 beta 3) did consistency fixes across the code-base. Unfortunately this was done without enough checks on the actual meaning of one of the fixes, which means error re-raising in lib/errors.py is broken. The problem is that: raise cls, args is different than: raise cls(args) And our unit-tests didn't catch this (this patch updates the tests). This breakage is usually trivial, like wrong error messages: $ gnt-instance remove no-such-instance Failure: prerequisites not met for this operation: ("Instance 'no-such-instance' not known", 'unknown_entity') versus: $ gnt-instance remove no-such-instance Failure: prerequisites not met for this operation: error type: unknown_entity, error details: Instance 'no-such-instance' not known or: $ gnt-instance add … no-such-instance Failure: prerequisites not met for this operation: ('The given name (no-such-instance) does not resolve: Name or service not known', 'resolver_error') versus: $ gnt-instance add … no-such-instance Failure: prerequisites not met for this operation: error type: resolver_error, error details: The given name (no-such-instance) does not resolve: Name or service not known But in some cases where we rely on a certain data representation (e.g. HooksAbort), this actually breaks because we try to iterate over the wrong type: File "/usr/lib/python2.6/dist-packages/ganeti/cli.py", line 1907, in FormatError for node, script, out in err.args[0]: ValueError: need more than 1 value to unpack Signed-off-by:
Iustin Pop <iustin@google.com> Reviewed-by:
Michael Hanselmann <hansmi@google.com>
98dfcaff
ganeti.errors_unittest.py 2.93 KiB
#!/usr/bin/python
#
# Copyright (C) 2010, 2012 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
"""Script for testing ganeti.backend"""
import os
import sys
import unittest
from ganeti import errors
import testutils
class TestErrors(testutils.GanetiTestCase):
def testGetErrorClass(self):
tdata = {
"": None,
".": None,
"-": None,
"ECODE_INVAL": None,
"NoErrorClassName": None,
"GenericError": errors.GenericError,
"ProgrammerError": errors.ProgrammerError,
}
for name, cls in tdata.items():
self.assert_(errors.GetErrorClass(name) is cls)
def testEncodeException(self):
self.assertEqualValues(errors.EncodeException(Exception("Foobar")),
("Exception", ("Foobar", )))
err = errors.GenericError(True, 100, "foo", ["x", "y"])
self.assertEqualValues(errors.EncodeException(err),
("GenericError", (True, 100, "foo", ["x", "y"])))
def testMaybeRaise(self):
testvals = [None, 1, 2, 3, "Hello World", (1, ), (1, 2, 3),
("NoErrorClassName", []), ("NoErrorClassName", None),
("GenericError", [1, 2, 3], None), ("GenericError", 1)]
# These shouldn't raise
for i in testvals:
errors.MaybeRaise(i)
self.assertRaises(errors.GenericError, errors.MaybeRaise,
("GenericError", ["Hello"]))
# Check error encoding
for i in testvals:
src = errors.GenericError(i)
try:
errors.MaybeRaise(errors.EncodeException(src))
except errors.GenericError, dst:
self.assertEqual(src.args, dst.args)
self.assertEqual(src.__class__, dst.__class__)
else:
self.fail("Exception %s not raised" % repr(src))
def testGetEncodedError(self):
self.assertEqualValues(errors.GetEncodedError(["GenericError",
("Hello", 123, "World")]),
(errors.GenericError, ("Hello", 123, "World")))
self.assertEqualValues(errors.GetEncodedError(["GenericError", []]),
(errors.GenericError, ()))
self.assertFalse(errors.GetEncodedError(["NoErrorClass",
("Hello", 123, "World")]))
if __name__ == "__main__":
testutils.GanetiTestProgram()