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

tests: skip a detailed exit status in test-lfs-test-server...

tests: skip a detailed exit status in test-lfs-test-server The mode of failure here differs between `lfs-test-server` and `hg serve`, and they each throw a different exception. The `hg serve` case raises a subclass of `StorageError`, which gets a detailed status. The `lfs-test-server` case raises a subclass of `Abort`, which does not. Since the exit code isn't currently conditionizable in the tests, this is the simplest way to avoid the failure. Differential Revision: https://phab.mercurial-scm.org/D9836

Augie Fackler - - Load All Authors

File last commit:

r45376:2870f5d5 default


                r47062:47b11629

stable

Download file

             fakemergerecord.py
        
                    32 lines
            
             | 802 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / fakemergerecord.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Extension to write out fake unsupported records into the merge state

      #

      #

      from __future__ import absolute_import

      from mercurial import (

          mergestate as mergestatemod,

          registrar,

      )

      cmdtable = {}

      command = registrar.command(cmdtable)

      @command(

          b'fakemergerecord',

          [

              (b'X', b'mandatory', None, b'add a fake mandatory record'),

              (b'x', b'advisory', None, b'add a fake advisory record'),

          ],

          '',

      )

      def fakemergerecord(ui, repo, *pats, **opts):

          with repo.wlock():

              ms = mergestatemod.mergestate.read(repo)

              records = ms._makerecords()

              if opts.get('mandatory'):

                  records.append((b'X', b'mandatory record'))

              if opts.get('advisory'):

                  records.append((b'x', b'advisory record'))

              ms._writerecords(records)

	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

				# Extension to write out fake unsupported records into the merge state
				#
				#

				from __future__ import absolute_import

				from mercurial import (
				mergestate as mergestatemod,
				registrar,
				)

				cmdtable = {}
				command = registrar.command(cmdtable)


				@command(
				b'fakemergerecord',
				[
				(b'X', b'mandatory', None, b'add a fake mandatory record'),
				(b'x', b'advisory', None, b'add a fake advisory record'),
				],
				'',
				)
				def fakemergerecord(ui, repo, pats, *opts):
				with repo.wlock():
				ms = mergestatemod.mergestate.read(repo)
				records = ms._makerecords()
				if opts.get('mandatory'):
				records.append((b'X', b'mandatory record'))
				if opts.get('advisory'):
				records.append((b'x', b'advisory record'))
				ms._writerecords(records)