~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_gpg.py

  • Committer: James Westby
  • Date: 2008-02-25 23:41:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3246.
  • Revision ID: jw+debian@jameswestby.net-20080225234106-9b4ql42w13ijewp3
Make version-info --custom imply --all.

When using a custom template you can use variables like {clean} which
are not enabled by default. This causes an ugly traceback.

This fixes the issue by implying --all when --custom (or more exactly
--template) is used, so that all variables are available in templates.

This was the easier fix than having the template code report that the
user should pass --check-clean to have {clean} available, but will
have a performance impact on all users of version-info --custom,
regardless of whether they use {clean}.

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
"""Tests for signing and verifying blobs of data via gpg."""
19
19
 
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)