/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
192
192
                self._formatTime(self._benchmarkTime),
193
193
                self._elapsedTestTimeString())
194
194
        else:
195
 
            return "      %s" % self._elapsedTestTimeString()
 
195
            return "           %s" % self._elapsedTestTimeString()
196
196
 
197
197
    def _formatTime(self, seconds):
198
198
        """Format seconds as milliseconds with leading spaces."""
199
 
        return "%5dms" % (1000 * seconds)
 
199
        # some benchmarks can take thousands of seconds to run, so we need 8
 
200
        # places
 
201
        return "%8dms" % (1000 * seconds)
200
202
 
201
203
    def _shortened_test_description(self, test):
202
204
        what = test.id()
203
 
        what = re.sub(r'^bzrlib\.(tests|benchmark)\.', '', what)
 
205
        what = re.sub(r'^bzrlib\.(tests|benchmarks)\.', '', what)
204
206
        return what
205
207
 
206
208
    def startTest(self, test):
376
378
    def report_test_start(self, test):
377
379
        self.count += 1
378
380
        name = self._shortened_test_description(test)
379
 
        self.stream.write(self._ellipsize_to_right(name, 60))
 
381
        # width needs space for 6 char status, plus 1 for slash, plus 2 10-char
 
382
        # numbers, plus a trailing blank
 
383
        self.stream.write(self._ellipsize_to_right(name,
 
384
                            osutils.terminal_width()-30))
380
385
        self.stream.flush()
381
386
 
382
387
    def report_error(self, test, err):
386
391
 
387
392
    def report_failure(self, test, err):
388
393
        self.failure_count += 1
389
 
        self.stream.writeln('FAIL %s\n    %s'
 
394
        self.stream.writeln(' FAIL %s\n    %s'
390
395
                % (self._testTimeString(), err[1]))
391
396
 
392
397
    def report_success(self, test):
792
797
            'BZREMAIL': None, # may still be present in the environment
793
798
            'EMAIL': None,
794
799
            'BZR_PROGRESS_BAR': None,
 
800
            # Proxies
 
801
            'http_proxy': None,
 
802
            'HTTP_PROXY': None,
 
803
            'https_proxy': None,
 
804
            'HTTPS_PROXY': None,
 
805
            'no_proxy': None,
 
806
            'NO_PROXY': None,
 
807
            'all_proxy': None,
 
808
            'ALL_PROXY': None,
 
809
            # Nobody cares about these ones AFAIK. So far at
 
810
            # least. If you do (care), please update this comment
 
811
            # -- vila 20061212
 
812
            'ftp_proxy': None,
 
813
            'FTP_PROXY': None,
795
814
        }
796
815
        self.__old_env = {}
797
816
        self.addCleanup(self._restoreEnvironment)
1518
1537
                os.chdir(self.test_dir)
1519
1538
                break
1520
1539
 
1521
 
    def build_tree(self, shape, line_endings='native', transport=None):
 
1540
    def build_tree(self, shape, line_endings='binary', transport=None):
1522
1541
        """Build a test tree according to a pattern.
1523
1542
 
1524
1543
        shape is a sequence of file specifications.  If the final
1738
1757
    """
1739
1758
    testmod_names = [
1740
1759
                   'bzrlib.tests.test_ancestry',
 
1760
                   'bzrlib.tests.test_annotate',
1741
1761
                   'bzrlib.tests.test_api',
1742
1762
                   'bzrlib.tests.test_atomicfile',
1743
1763
                   'bzrlib.tests.test_bad_files',
1745
1765
                   'bzrlib.tests.test_bundle',
1746
1766
                   'bzrlib.tests.test_bzrdir',
1747
1767
                   'bzrlib.tests.test_cache_utf8',
1748
 
                   'bzrlib.tests.test_command',
 
1768
                   'bzrlib.tests.test_commands',
1749
1769
                   'bzrlib.tests.test_commit',
1750
1770
                   'bzrlib.tests.test_commit_merge',
1751
1771
                   'bzrlib.tests.test_config',
1758
1778
                   'bzrlib.tests.test_fetch',
1759
1779
                   'bzrlib.tests.test_ftp_transport',
1760
1780
                   'bzrlib.tests.test_generate_ids',
 
1781
                   'bzrlib.tests.test_globbing',
1761
1782
                   'bzrlib.tests.test_gpg',
1762
1783
                   'bzrlib.tests.test_graph',
1763
1784
                   'bzrlib.tests.test_hashcache',
1859
1880
    """Adapt the modules in mods_list using adapter and add to suite."""
1860
1881
    for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)):
1861
1882
        suite.addTests(adapter.adapt(test))
 
1883
 
 
1884
 
 
1885
def clean_selftest_output(root=None, quiet=False):
 
1886
    """Remove all selftest output directories from root directory.
 
1887
 
 
1888
    :param  root:   root directory for clean
 
1889
                    (if ommitted or None then clean current directory).
 
1890
    :param  quiet:  suppress report about deleting directories
 
1891
    """
 
1892
    import re
 
1893
    import shutil
 
1894
 
 
1895
    re_dir = re.compile(r'''test\d\d\d\d\.tmp''')
 
1896
    if root is None:
 
1897
        root = u'.'
 
1898
    for i in os.listdir(root):
 
1899
        if os.path.isdir(i) and re_dir.match(i):
 
1900
            if not quiet:
 
1901
                print 'delete directory:', i
 
1902
            shutil.rmtree(i)