upstream/mercurial-mirror Files · tests/failfilemerge.py

tests: use pattern matching to mask `ECONNREFUSED` messages...

tests: use pattern matching to mask `ECONNREFUSED` messages The second and third one of these in `test-http-proxy.t` was failing on Windows. The others were found by grep and by failed tests when output was matched and an attempt was made to emit the mask pattern. The first clonebundles failure on Windows emitted: error fetching bundle: [WinError 10061] $ECONNREFUSED$ We should probably stringify that better to get rid of the "[WinError 10061]" part.

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r52835:73a43fe3

default

Download file

             failfilemerge.py
        
                    16 lines
            
             | 281 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / failfilemerge.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mads Kiilerich
    
spelling: fixes of non-dictionary words

              r30332
            
      # extension to emulate interrupting filemerge._filemerge

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      from mercurial import (

        Yuya Nishihara
    
tests: sort import lines in failfilemerge.py

              r28772
            
          error,

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
          extensions,

        Yuya Nishihara
    
tests: sort import lines in failfilemerge.py

              r28772
            
          filemerge,

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      )

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Martin von Zweigbergk
    
tests: remove unnecessary explicit args from `failfilemerge.py`...

              r49255
            
      def failfilemerge(*args, **kwargs):

        Martin von Zweigbergk
    
errors: stop passing non-strings to Abort's constructor...

              r46273
            
          raise error.Abort(b"^C")

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      def extsetup(ui):

        Martin von Zweigbergk
    
filemerge: inline `_filemerge()` into `filemerge()`...

              r49261
            
          extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Mads Kiilerich spelling: fixes of non-dictionary words	r30332	# extension to emulate interrupting filemerge._filemerge
timeless rebase: update working directory when aborting (issue5084)	r27988

		from mercurial import (
Yuya Nishihara tests: sort import lines in failfilemerge.py	r28772	error,
timeless rebase: update working directory when aborting (issue5084)	r27988	extensions,
Yuya Nishihara tests: sort import lines in failfilemerge.py	r28772	filemerge,
timeless rebase: update working directory when aborting (issue5084)	r27988	)

Augie Fackler formatting: blacken the codebase...	r43346
Martin von Zweigbergk tests: remove unnecessary explicit args from `failfilemerge.py`...	r49255	def failfilemerge(args, *kwargs):
Martin von Zweigbergk errors: stop passing non-strings to Abort's constructor...	r46273	raise error.Abort(b"^C")
timeless rebase: update working directory when aborting (issue5084)	r27988
Augie Fackler formatting: blacken the codebase...	r43346
timeless rebase: update working directory when aborting (issue5084)	r27988	def extsetup(ui):
Martin von Zweigbergk filemerge: inline `_filemerge()` into `filemerge()`...	r49261	extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)