← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Starr-Bochicchio
  • Date: 2014-03-30 17:59:29 UTC
  • mto: This revision was merged to the branch mainline in revision 6592.
  • Revision ID: a.starr.b@gmail.com-20140330175929-rd97jstcbau2j1gy
https://launchpad.net/bugs/1030521
Use LooseVersion from distutils to check Cython version in order to handle non-integers in the version string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
837
837
        test_in_cp866 = '\x92\xa5\xe1\xe2'
838
838
        test_in_cp1251 = '\xd2\xe5\xf1\xf2'
839
839
        # Make sure the log string is encoded in cp866
840
 
        self.assertEqual(test_in_cp866, message[2:])
 
840
        self.assertEquals(test_in_cp866, message[2:])
841
841
        # Make sure the cp1251 string is not found anywhere
842
 
        self.assertEqual(-1, stdout.find(test_in_cp1251))
 
842
        self.assertEquals(-1, stdout.find(test_in_cp1251))
843
843
 
844
844
 
845
845
class TestLogFile(TestLogWithLogCatcher):
1018
1018
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
1019
1019
        self.assertEqual(["2", "1"],
1020
1020
                         [r.revno for r in self.get_captured_revisions()])
1021
 
        self.assertEqual("bzr: ERROR: Further revision history missing.", stderr)
 
1021
        self.assertEquals("bzr: ERROR: Further revision history missing.", stderr)
1022
1022
 
1023
1023
    def test_log_range_open_end(self):
1024
1024
        self.assertLogRevnos(["-r1.."], ["2", "1"])