/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

  • Committer: Aaron Bentley
  • Date: 2006-12-22 02:00:06 UTC
  • mfrom: (2212 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20061222020006-8h1kgh4iax3c90ju
merge 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)
1481
1500
                os.chdir(self.test_dir)
1482
1501
                break
1483
1502
 
1484
 
    def build_tree(self, shape, line_endings='native', transport=None):
 
1503
    def build_tree(self, shape, line_endings='binary', transport=None):
1485
1504
        """Build a test tree according to a pattern.
1486
1505
 
1487
1506
        shape is a sequence of file specifications.  If the final
1706
1725
    """
1707
1726
    testmod_names = [
1708
1727
                   'bzrlib.tests.test_ancestry',
 
1728
                   'bzrlib.tests.test_annotate',
1709
1729
                   'bzrlib.tests.test_api',
1710
1730
                   'bzrlib.tests.test_atomicfile',
1711
1731
                   'bzrlib.tests.test_bad_files',
1713
1733
                   'bzrlib.tests.test_bundle',
1714
1734
                   'bzrlib.tests.test_bzrdir',
1715
1735
                   'bzrlib.tests.test_cache_utf8',
1716
 
                   'bzrlib.tests.test_command',
 
1736
                   'bzrlib.tests.test_commands',
1717
1737
                   'bzrlib.tests.test_commit',
1718
1738
                   'bzrlib.tests.test_commit_merge',
1719
1739
                   'bzrlib.tests.test_config',
1727
1747
                   'bzrlib.tests.test_fetch',
1728
1748
                   'bzrlib.tests.test_ftp_transport',
1729
1749
                   'bzrlib.tests.test_generate_ids',
 
1750
                   'bzrlib.tests.test_globbing',
1730
1751
                   'bzrlib.tests.test_gpg',
1731
1752
                   'bzrlib.tests.test_graph',
1732
1753
                   'bzrlib.tests.test_hashcache',
1827
1848
    """Adapt the modules in mods_list using adapter and add to suite."""
1828
1849
    for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)):
1829
1850
        suite.addTests(adapter.adapt(test))
 
1851
 
 
1852
 
 
1853
def clean_selftest_output(root=None, quiet=False):
 
1854
    """Remove all selftest output directories from root directory.
 
1855
 
 
1856
    :param  root:   root directory for clean
 
1857
                    (if ommitted or None then clean current directory).
 
1858
    :param  quiet:  suppress report about deleting directories
 
1859
    """
 
1860
    import re
 
1861
    import shutil
 
1862
 
 
1863
    re_dir = re.compile(r'''test\d\d\d\d\.tmp''')
 
1864
    if root is None:
 
1865
        root = u'.'
 
1866
    for i in os.listdir(root):
 
1867
        if os.path.isdir(i) and re_dir.match(i):
 
1868
            if not quiet:
 
1869
                print 'delete directory:', i
 
1870
            shutil.rmtree(i)