← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_dpush.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/blackbox/test_dpush.py
1
 
# Copyright (C) 2009-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2009-2012 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
53
53
        target_tree = self.make_branch_and_tree("dp")
54
54
        source_tree = self.make_branch_and_tree("dc")
55
55
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
56
 
        self.assertEqual("", output)
 
56
        self.assertEquals("", output)
57
57
        self.assertContainsRe(error,
58
58
            'in the same VCS, lossy push not necessary. Please use regular '
59
59
            'push.')
132
132
          [('modify', ('fooid', 'blie'))])
133
133
 
134
134
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
135
 
        self.assertEqual(output, "")
 
135
        self.assertEquals(output, "")
136
136
        self.assertContainsRe(error, "have diverged")
137
137
 
138
138