~jameinel/bzr/fix-push2

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-18 15:57:21 UTC
  • mfrom: (2194 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2196.
  • Revision ID: john@arbash-meinel.com-20061218155721-9xb84yhuww8dz1ri
[merge] bzr.dev 2194

Show diffs side-by-side

added added

removed removed

Lines of Context:
376
376
    def report_test_start(self, test):
377
377
        self.count += 1
378
378
        name = self._shortened_test_description(test)
379
 
        self.stream.write(self._ellipsize_to_right(name, 60))
 
379
        self.stream.write(self._ellipsize_to_right(name,
 
380
                            osutils.terminal_width()-20))
380
381
        self.stream.flush()
381
382
 
382
383
    def report_error(self, test, err):
386
387
 
387
388
    def report_failure(self, test, err):
388
389
        self.failure_count += 1
389
 
        self.stream.writeln('FAIL %s\n    %s'
 
390
        self.stream.writeln(' FAIL %s\n    %s'
390
391
                % (self._testTimeString(), err[1]))
391
392
 
392
393
    def report_success(self, test):
792
793
            'BZREMAIL': None, # may still be present in the environment
793
794
            'EMAIL': None,
794
795
            'BZR_PROGRESS_BAR': None,
 
796
            # Proxies
 
797
            'http_proxy': None,
 
798
            'HTTP_PROXY': None,
 
799
            'https_proxy': None,
 
800
            'HTTPS_PROXY': None,
 
801
            'no_proxy': None,
 
802
            'NO_PROXY': None,
 
803
            'all_proxy': None,
 
804
            'ALL_PROXY': None,
 
805
            # Nobody cares about these ones AFAIK. So far at
 
806
            # least. If you do (care), please update this comment
 
807
            # -- vila 20061212
 
808
            'ftp_proxy': None,
 
809
            'FTP_PROXY': None,
795
810
        }
796
811
        self.__old_env = {}
797
812
        self.addCleanup(self._restoreEnvironment)
1704
1719
    """
1705
1720
    testmod_names = [
1706
1721
                   'bzrlib.tests.test_ancestry',
 
1722
                   'bzrlib.tests.test_annotate',
1707
1723
                   'bzrlib.tests.test_api',
1708
1724
                   'bzrlib.tests.test_atomicfile',
1709
1725
                   'bzrlib.tests.test_bad_files',
1711
1727
                   'bzrlib.tests.test_bundle',
1712
1728
                   'bzrlib.tests.test_bzrdir',
1713
1729
                   'bzrlib.tests.test_cache_utf8',
1714
 
                   'bzrlib.tests.test_command',
 
1730
                   'bzrlib.tests.test_commands',
1715
1731
                   'bzrlib.tests.test_commit',
1716
1732
                   'bzrlib.tests.test_commit_merge',
1717
1733
                   'bzrlib.tests.test_config',
1724
1740
                   'bzrlib.tests.test_fetch',
1725
1741
                   'bzrlib.tests.test_ftp_transport',
1726
1742
                   'bzrlib.tests.test_generate_ids',
 
1743
                   'bzrlib.tests.test_globbing',
1727
1744
                   'bzrlib.tests.test_gpg',
1728
1745
                   'bzrlib.tests.test_graph',
1729
1746
                   'bzrlib.tests.test_hashcache',
1823
1840
    """Adapt the modules in mods_list using adapter and add to suite."""
1824
1841
    for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)):
1825
1842
        suite.addTests(adapter.adapt(test))
 
1843
 
 
1844
 
 
1845
def clean_selftest_output(root=None, quiet=False):
 
1846
    """Remove all selftest output directories from root directory.
 
1847
 
 
1848
    :param  root:   root directory for clean
 
1849
                    (if ommitted or None then clean current directory).
 
1850
    :param  quiet:  suppress report about deleting directories
 
1851
    """
 
1852
    import re
 
1853
    import shutil
 
1854
 
 
1855
    re_dir = re.compile(r'''test\d\d\d\d\.tmp''')
 
1856
    if root is None:
 
1857
        root = u'.'
 
1858
    for i in os.listdir(root):
 
1859
        if os.path.isdir(i) and re_dir.match(i):
 
1860
            if not quiet:
 
1861
                print 'delete directory:', i
 
1862
            shutil.rmtree(i)