|
 |
adf098 |
--- unittest2/test/test_loader.py.orig 2015-11-15 09:26:43.752421511 +0100
|
|
|
adf098 |
+++ unittest2/test/test_loader.py 2015-11-15 11:02:43.944233784 +0100
|
|
|
adf098 |
@@ -512,10 +512,20 @@
|
|
|
adf098 |
def test_loadTestsFromName__relative_malformed_name(self):
|
|
|
adf098 |
loader = unittest.TestLoader()
|
|
|
adf098 |
|
|
|
adf098 |
+ # XXX Should this raise AttributeError or ValueError?
|
|
|
adf098 |
suite = loader.loadTestsFromName('abc () //', unittest)
|
|
|
adf098 |
error, test = self.check_deferred_error(loader, suite)
|
|
|
adf098 |
- self.check_module_lookup_error(
|
|
|
adf098 |
- error, test, 'unittest2', 'abc () //', 'abc \(\) //')
|
|
|
adf098 |
+ if sys.version_info[:2] < (3, 5):
|
|
|
adf098 |
+ expected = "'module' object has no attribute 'abc () //'"
|
|
|
adf098 |
+ expected_regex = "'module' object has no attribute 'abc \(\) //'"
|
|
|
adf098 |
+ else:
|
|
|
adf098 |
+ expected = "module 'unittest2' has no attribute 'abc () //'"
|
|
|
adf098 |
+ expected_regex = "module 'unittest2' has no attribute 'abc \(\) //'"
|
|
|
adf098 |
+ self.assertIn(
|
|
|
adf098 |
+ expected, error,
|
|
|
adf098 |
+ 'missing error string in %r' % error)
|
|
|
adf098 |
+ self.assertRaisesRegex(
|
|
|
adf098 |
+ AttributeError, expected_regex, getattr(test, 'abc () //'))
|
|
|
adf098 |
|
|
|
adf098 |
# "The method optionally resolves name relative to the given module"
|
|
|
adf098 |
#
|
|
|
adf098 |
@@ -924,8 +934,17 @@
|
|
|
adf098 |
# XXX Should this raise AttributeError or ValueError?
|
|
|
adf098 |
suite = loader.loadTestsFromNames(['abc () //'], unittest)
|
|
|
adf098 |
error, test = self.check_deferred_error(loader, list(suite)[0])
|
|
|
adf098 |
- self.check_module_lookup_error(
|
|
|
adf098 |
- error, test, 'unittest2', 'abc () //', 'abc \(\) //')
|
|
|
adf098 |
+ if sys.version_info[:2] < (3, 5):
|
|
|
adf098 |
+ expected = "'module' object has no attribute 'abc () //'"
|
|
|
adf098 |
+ expected_regex = "'module' object has no attribute 'abc \(\) //'"
|
|
|
adf098 |
+ else:
|
|
|
adf098 |
+ expected = "module 'unittest2' has no attribute 'abc () //'"
|
|
|
adf098 |
+ expected_regex = "module 'unittest2' has no attribute 'abc \(\) //'"
|
|
|
adf098 |
+ self.assertIn(
|
|
|
adf098 |
+ expected, error,
|
|
|
adf098 |
+ 'missing error string in %r' % error)
|
|
|
adf098 |
+ self.assertRaisesRegex(
|
|
|
adf098 |
+ AttributeError, expected_regex, getattr(test, 'abc () //'))
|
|
|
adf098 |
|
|
|
adf098 |
# "The method optionally resolves name relative to the given module"
|
|
|
adf098 |
#
|