upstream/mercurial-mirror Files · tests/test-dicthelpers.py

cmdserver: forcibly use L channel to read password input (issue3161)...

cmdserver: forcibly use L channel to read password input (issue3161) Command server is designed to use the channel protocol even if the server process is accessible to tty, whereas vanilla hg should be able to read password from tty in that case. So it isn't enough to swap sys.stdin: # works only if the server process is detached from the console sys.stdin = self.fin getpass.getpass('') sys.stdin = oldin or test isatty: # vanilla hg can't talk to tty if stdin is redirected if self._isatty(self.fin): return getpass.getpass('') else: ... Since ui.nontty flag is undocumented and command-server channels don't provide isatty(), this change won't affect the other uses of ui._isatty(). issue3161 also suggests to provide some context of messages. I think it can be implemented by using the generic templating function.

Siddharth Agarwal - - Load All Authors

File last commit:

r18894:ed46c2b9 default


                r21195:9336bc7d

stable

Download file

             test-dicthelpers.py
        
                    59 lines
            
             | 2.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-dicthelpers.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Siddharth Agarwal
    
mercurial: implement diff and join for dicts...

              r18820
            
      from mercurial.dicthelpers import diff, join

      import unittest

      import silenttestrunner

      class testdicthelpers(unittest.TestCase):

          def test_dicthelpers(self):

              # empty dicts

              self.assertEqual(diff({}, {}), {})

              self.assertEqual(join({}, {}), {})

              d1 = {}

              d1['a'] = 'foo'

              d1['b'] = 'bar'

              d1['c'] = 'baz'

              # same identity

              self.assertEqual(diff(d1, d1), {})

              self.assertEqual(join(d1, d1), {'a': ('foo', 'foo'),

                                              'b': ('bar', 'bar'),

                                              'c': ('baz', 'baz')})

              # vs empty

              self.assertEqual(diff(d1, {}), {'a': ('foo', None),

                                              'b': ('bar', None),

                                              'c': ('baz', None)})

              self.assertEqual(diff(d1, {}), {'a': ('foo', None),

                                              'b': ('bar', None),

                                              'c': ('baz', None)})

              d2 = {}

              d2['a'] = 'foo2'

              d2['b'] = 'bar'

              d2['d'] = 'quux'

              self.assertEqual(diff(d1, d2), {'a': ('foo', 'foo2'),

                                              'c': ('baz', None),

                                              'd': (None, 'quux')})

              self.assertEqual(join(d1, d2), {'a': ('foo', 'foo2'),

                                              'b': ('bar', 'bar'),

                                              'c': ('baz', None),

                                              'd': (None, 'quux')})

              # with default argument

              self.assertEqual(diff(d1, d2, 123), {'a': ('foo', 'foo2'),

                                                   'c': ('baz', 123),

                                                   'd': (123, 'quux')})

              self.assertEqual(join(d1, d2, 456), {'a': ('foo', 'foo2'),

                                                   'b': ('bar', 'bar'),

                                                   'c': ('baz', 456),

                                                   'd': (456, 'quux')})

        Siddharth Agarwal
    
dicthelpers.diff: compare against default for missing values...

              r18894
            
              # check that we compare against default

              self.assertEqual(diff(d1, d2, 'baz'), {'a': ('foo', 'foo2'),

                                                     'd': ('baz', 'quux')})

              self.assertEqual(diff(d1, d2, 'quux'), {'a': ('foo', 'foo2'),

                                                      'c': ('baz', 'quux')})

        Siddharth Agarwal
    
mercurial: implement diff and join for dicts...

              r18820
            
      if __name__ == '__main__':

          silenttestrunner.main(__name__)

	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

Siddharth Agarwal mercurial: implement diff and join for dicts...	r18820	from mercurial.dicthelpers import diff, join
		import unittest
		import silenttestrunner

		class testdicthelpers(unittest.TestCase):
		def test_dicthelpers(self):
		# empty dicts
		self.assertEqual(diff({}, {}), {})
		self.assertEqual(join({}, {}), {})

		d1 = {}
		d1['a'] = 'foo'
		d1['b'] = 'bar'
		d1['c'] = 'baz'

		# same identity
		self.assertEqual(diff(d1, d1), {})
		self.assertEqual(join(d1, d1), {'a': ('foo', 'foo'),
		'b': ('bar', 'bar'),
		'c': ('baz', 'baz')})

		# vs empty
		self.assertEqual(diff(d1, {}), {'a': ('foo', None),
		'b': ('bar', None),
		'c': ('baz', None)})
		self.assertEqual(diff(d1, {}), {'a': ('foo', None),
		'b': ('bar', None),
		'c': ('baz', None)})

		d2 = {}
		d2['a'] = 'foo2'
		d2['b'] = 'bar'
		d2['d'] = 'quux'

		self.assertEqual(diff(d1, d2), {'a': ('foo', 'foo2'),
		'c': ('baz', None),
		'd': (None, 'quux')})
		self.assertEqual(join(d1, d2), {'a': ('foo', 'foo2'),
		'b': ('bar', 'bar'),
		'c': ('baz', None),
		'd': (None, 'quux')})

		# with default argument
		self.assertEqual(diff(d1, d2, 123), {'a': ('foo', 'foo2'),
		'c': ('baz', 123),
		'd': (123, 'quux')})
		self.assertEqual(join(d1, d2, 456), {'a': ('foo', 'foo2'),
		'b': ('bar', 'bar'),
		'c': ('baz', 456),
		'd': (456, 'quux')})

Siddharth Agarwal dicthelpers.diff: compare against default for missing values...	r18894	# check that we compare against default
		self.assertEqual(diff(d1, d2, 'baz'), {'a': ('foo', 'foo2'),
		'd': ('baz', 'quux')})
		self.assertEqual(diff(d1, d2, 'quux'), {'a': ('foo', 'foo2'),
		'c': ('baz', 'quux')})

Siddharth Agarwal mercurial: implement diff and join for dicts...	r18820	if __name__ == '__main__':
		silenttestrunner.main(__name__)