← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/TestUtil.py

  • Committer: Vincent Ladeuil
  • Date: 2010-08-31 08:24:17 UTC
  • mto: This revision was merged to the branch mainline in revision 5400.
  • Revision ID: v.ladeuil+lp@free.fr-20100831082417-7p8w4k94go3x8kbr
https://launchpad.net/bugs/627277
Catch EPIPE during test server shutdown.

* bzrlib/tests/test_server.py:
(TestingTCPServerMixin.ignored_exceptions_during_shutdown): EPIPE
should be expected.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/TestUtil.py
1
 
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#       Author: Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
72
72
        visitor.visitSuite(self)
73
73
        visitTests(self, visitor)
74
74
 
 
75
    def run(self, result):
 
76
        """Run the tests in the suite, discarding references after running."""
 
77
        tests = list(self)
 
78
        tests.reverse()
 
79
        self._tests = []
 
80
        while tests:
 
81
            if result.shouldStop:
 
82
                self._tests = reversed(tests)
 
83
                break
 
84
            tests.pop().run(result)
 
85
        return result
 
86
 
75
87
 
76
88
class TestLoader(unittest.TestLoader):
77
89
    """Custom TestLoader to extend the stock python one."""
123
135
        >>>         result.addTests([test, test])
124
136
        >>>     return result
125
137
        """
126
 
        basic_tests = super(TestLoader, self).loadTestsFromModule(module)
 
138
        if sys.version_info < (2, 7):
 
139
            basic_tests = super(TestLoader, self).loadTestsFromModule(module)
 
140
        else:
 
141
            # GZ 2010-07-19: Python 2.7 unittest also uses load_tests but with
 
142
            #                a different and incompatible signature
 
143
            basic_tests = super(TestLoader, self).loadTestsFromModule(module,
 
144
                use_load_tests=False)
127
145
        load_tests = getattr(module, "load_tests", None)
128
146
        if load_tests is not None:
129
147
            return load_tests(basic_tests, module, self)