← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_gpg.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_gpg.py
29
29
 
30
30
    def gpg_signing_command(self):
31
31
        return "false"
32
 
        
 
32
 
33
33
 
34
34
class TestCommandLine(TestCase):
35
35
 
50
50
        if sys.platform == 'win32':
51
51
            # Windows doesn't come with cat, and we don't require it
52
52
            # so lets try using python instead.
53
 
            # But stupid windows and line-ending conversions. 
 
53
            # But stupid windows and line-ending conversions.
54
54
            # It is too much work to make sys.stdout be in binary mode.
55
55
            # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65443
56
56
            my_gpg._command_line = lambda:[sys.executable, '-c',
69
69
    def test_clears_progress(self):
70
70
        content = "some content\nwith newlines\n"
71
71
        old_clear_term = ui.ui_factory.clear_term
72
 
        clear_term_called = [] 
 
72
        clear_term_called = []
73
73
        def clear_term():
74
74
            old_clear_term()
75
75
            clear_term_called.append(True)