← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_weave.py

  • Committer: Patch Queue Manager
  • Date: 2015-10-05 13:45:00 UTC
  • mfrom: (6603.3.1 bts794146)
  • Revision ID: pqm@pqm.ubuntu.com-20151005134500-v244rho557tv0ukd
(vila) Resolve Bug #1480015: Test failure: hexify removed from paramiko
 (Andrew Starr-Bochicchio) (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_weave.py
1
 
# Copyright (C) 2005-2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
588
588
 
589
589
        merged = k.merge([1, 2])
590
590
 
591
 
        self.assertEqual([[['aaa']],
 
591
        self.assertEquals([[['aaa']],
592
592
                           [['111'], ['222']],
593
593
                           [['bbb']]])
594
594
 
681
681
        write_weave(w, tmpf)
682
682
 
683
683
        # Because we are corrupting, we need to make sure we have the exact text
684
 
        self.assertEqual('# bzr weave file v5\n'
 
684
        self.assertEquals('# bzr weave file v5\n'
685
685
                          'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
686
686
                          'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
687
687
                          'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n',