~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
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"])
1096
1096
        # upwards without agreement from bzr's network support maintainers.
1097
1097
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
1098
1098
        self.assertLength(1, self.hpss_connections)
1099
 
        self.assertLength(9, self.hpss_calls)
 
1099
        self.assertLength(10, self.hpss_calls)
1100
1100
 
1101
1101
    def test_verbose_log(self):
1102
1102
        self.setup_smart_server_with_call_log()
1111
1111
        # being too low. If rpc_count increases, more network roundtrips have
1112
1112
        # become necessary for this use case. Please do not adjust this number
1113
1113
        # upwards without agreement from bzr's network support maintainers.
1114
 
        self.assertLength(10, self.hpss_calls)
 
1114
        self.assertLength(11, self.hpss_calls)
1115
1115
        self.assertLength(1, self.hpss_connections)
1116
1116
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
1117
1117
 
1128
1128
        # being too low. If rpc_count increases, more network roundtrips have
1129
1129
        # become necessary for this use case. Please do not adjust this number
1130
1130
        # upwards without agreement from bzr's network support maintainers.
1131
 
        self.assertLength(14, self.hpss_calls)
 
1131
        self.assertLength(15, self.hpss_calls)
1132
1132
        self.assertLength(1, self.hpss_connections)
1133
1133
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)