/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 breezy/tests/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2018-08-13 01:38:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7078.
  • Revision ID: jelmer@jelmer.uk-20180813013821-ftxhownoxs1l55qs
Fix some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/__init__.py
1925
1925
 
1926
1926
        self.log('run brz: %r', args)
1927
1927
 
1928
 
        # FIXME: don't call into logging here
1929
 
        handler = trace.EncodedStreamHandler(
1930
 
            stderr, errors="replace", level=logging.INFO)
1931
 
        logger = logging.getLogger('')
1932
 
        logger.addHandler(handler)
1933
 
 
1934
1928
        if PY3:
1935
1929
            self._last_cmd_stdout = stdout
1936
1930
            self._last_cmd_stderr = stderr
1957
1951
                    _mod_commands.run_bzr_catch_user_errors,
1958
1952
                    args)
1959
1953
        finally:
1960
 
            logger.removeHandler(handler)
1961
1954
            ui.ui_factory = old_ui_factory
1962
1955
            if cwd is not None:
1963
1956
                os.chdir(cwd)
2007
2000
            wrapped_stdout = stdout = ui_testing.BytesIOWithEncoding()
2008
2001
            wrapped_stderr = stderr = ui_testing.BytesIOWithEncoding()
2009
2002
            stdout.encoding = stderr.encoding = encoding
 
2003
 
 
2004
            # FIXME: don't call into logging here
 
2005
            handler = trace.EncodedStreamHandler(
 
2006
                stderr, errors="replace")
2010
2007
        else:
2011
2008
            stdout = BytesIO()
2012
2009
            stderr = BytesIO()
2013
2010
            wrapped_stdout = TextIOWrapper(stdout, encoding)
2014
2011
            wrapped_stderr = TextIOWrapper(stderr, encoding)
2015
 
 
2016
 
        result = self._run_bzr_core(
2017
 
                args, encoding=encoding, stdin=stdin, stdout=wrapped_stdout,
2018
 
                stderr=wrapped_stderr, working_dir=working_dir,
2019
 
                )
 
2012
            handler = logging.StreamHandler(wrapped_stderr)
 
2013
        handler.setLevel(logging.INFO)
 
2014
 
 
2015
        logger = logging.getLogger('')
 
2016
        logger.addHandler(handler)
 
2017
        try:
 
2018
            result = self._run_bzr_core(
 
2019
                    args, encoding=encoding, stdin=stdin, stdout=wrapped_stdout,
 
2020
                    stderr=wrapped_stderr, working_dir=working_dir,
 
2021
                    )
 
2022
        finally:
 
2023
            logger.removeHandler(handler)
 
2024
 
 
2025
        if PY3:
 
2026
            wrapped_stdout.flush()
 
2027
            wrapped_stderr.flush()
2020
2028
 
2021
2029
        out = stdout.getvalue()
2022
2030
        err = stderr.getvalue()
2075
2083
            stdout = ui_testing.BytesIOWithEncoding()
2076
2084
            stderr = ui_testing.BytesIOWithEncoding()
2077
2085
            stdout.encoding = stderr.encoding = encoding
 
2086
            # FIXME: don't call into logging here
 
2087
            handler = trace.EncodedStreamHandler(
 
2088
                stderr, errors="replace")
2078
2089
        else:
2079
2090
            stdout = ui_testing.StringIOWithEncoding()
2080
2091
            stderr = ui_testing.StringIOWithEncoding()
2081
2092
            stdout.encoding = stderr.encoding = encoding
2082
 
 
2083
 
        result = self._run_bzr_core(args,
2084
 
                encoding=encoding, stdin=stdin, stdout=stdout,
2085
 
                stderr=stderr, working_dir=working_dir,
2086
 
                )
 
2093
            handler = logging.StreamHandler(stream=stderr)
 
2094
        handler.setLevel(logging.INFO)
 
2095
 
 
2096
        logger = logging.getLogger('')
 
2097
        logger.addHandler(handler)
 
2098
 
 
2099
        try:
 
2100
            result = self._run_bzr_core(args,
 
2101
                    encoding=encoding, stdin=stdin, stdout=stdout,
 
2102
                    stderr=stderr, working_dir=working_dir,
 
2103
                    )
 
2104
        finally:
 
2105
            logger.removeHandler(handler)
2087
2106
 
2088
2107
        out = stdout.getvalue()
2089
2108
        err = stderr.getvalue()