← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_gpg.py

Fix BzrDir.create_workingtree for NULL_REVISION

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_gpg.py
21
21
import os
22
22
import sys
23
23
 
24
 
import bzrlib.errors as errors
 
24
from bzrlib import errors, ui
25
25
import bzrlib.gpg as gpg
26
26
from bzrlib.tests import TestCase, TestCaseInTempDir
27
27
 
44
44
        my_gpg = gpg.GPGStrategy(FakeConfig())
45
45
        self.assertRaises(errors.SigningFailed, my_gpg.sign, 'content')
46
46
 
47
 
    def test_returns_output(self):
48
 
        # This test needs a 'cat' command or similar to work.
 
47
    def assertProduces(self, content):
 
48
        # This needs a 'cat' command or similar to work.
49
49
        my_gpg = gpg.GPGStrategy(FakeConfig())
50
 
        content = "some content\nwith newlines\n"
51
 
 
52
50
        if sys.platform == 'win32':
53
51
            # Windows doesn't come with cat, and we don't require it
54
52
            # so lets try using python instead.
64
62
            my_gpg._command_line = lambda:['cat', '-']
65
63
            self.assertEqual(content, my_gpg.sign(content))
66
64
 
 
65
    def test_returns_output(self):
 
66
        content = "some content\nwith newlines\n"
 
67
        self.assertProduces(content)
 
68
 
 
69
    def test_clears_progress(self):
 
70
        content = "some content\nwith newlines\n"
 
71
        old_clear_term = ui.ui_factory.clear_term
 
72
        clear_term_called = [] 
 
73
        def clear_term():
 
74
            old_clear_term()
 
75
            clear_term_called.append(True)
 
76
        ui.ui_factory.clear_term = clear_term
 
77
        try:
 
78
            self.assertProduces(content)
 
79
        finally:
 
80
            ui.ui_factory.clear_term = old_clear_term
 
81
        self.assertEqual([True], clear_term_called)
 
82
 
67
83
 
68
84
class TestDisabled(TestCase):
69
85