← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_send.py

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
1
 
# Copyright (C) 2006-2012 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
316
316
            self.assertContainsRe(err, self._default_additional_warning)
317
317
            self.assertEndsWith(err, bundling_revs)
318
318
        else:
319
 
            self.assertEquals(bundling_revs, err)
 
319
            self.assertEqual(bundling_revs, err)
320
320
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
321
321
        self.assertEqual('parent', md.base_revision_id)
322
322
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))