diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 14:28:28 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 14:28:28 +0000 |
| commit | 0ed55e71a9f4b9cda836c6a4a5408cece60db0c6 (patch) | |
| tree | b1e82f6e428ac15ed9b4de93e48d8079420d537d /src/engine/SCons/WarningsTests.py | |
| parent | fe00e4f75ba00298c30d6854b245c2a42c6542b8 (diff) | |
| parent | 738149c9bfb9965d013d01ef99f9bb1c2819e7e8 (diff) | |
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'src/engine/SCons/WarningsTests.py')
| -rw-r--r-- | src/engine/SCons/WarningsTests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/SCons/WarningsTests.py b/src/engine/SCons/WarningsTests.py index 2a6e0b0..39a1602 100644 --- a/src/engine/SCons/WarningsTests.py +++ b/src/engine/SCons/WarningsTests.py @@ -21,15 +21,15 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/WarningsTests.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/WarningsTests.py 5023 2010/06/14 22:05:46 scons" import sys import unittest import SCons.Warnings -class TestOutput: +class TestOutput(object): def __call__(self, x): - args = x[0] + args = x.args[0] if len(args) == 1: args = args[0] self.out = str(args) @@ -94,10 +94,6 @@ class WarningsTestCase(unittest.TestCase): "Foo") assert to.out is None, to.out - SCons.Warnings.warn(SCons.Warnings.MandatoryWarning, - "Foo") - assert to.out is None, to.out - SCons.Warnings.enableWarningClass(SCons.Warnings.Warning) SCons.Warnings.warn(SCons.Warnings.DeprecatedWarning, "Foo") @@ -109,6 +105,10 @@ class WarningsTestCase(unittest.TestCase): "Foo") assert to.out is None, to.out + SCons.Warnings.warn(SCons.Warnings.MandatoryDeprecatedWarning, + "Foo") + assert to.out is None, to.out + # Dependency warnings should still be enabled though SCons.Warnings.enableWarningClass(SCons.Warnings.Warning) SCons.Warnings.warn(SCons.Warnings.DependencyWarning, |