~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_branch.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-23 21:36:06 UTC
  • mto: This revision was merged to the branch mainline in revision 5390.
  • Revision ID: john@arbash-meinel.com-20100823213606-1pk5w1nyaz9kz9k0
Lots of compatibility changes for python2.4 and mingw32 compilers.

gcc has strtoll available, and does the wrong thing if you use _strtoi64 (it implicitly
defines it to return an 'int' which isn't a 64-bit integer.)

Further, python2.4 doesn't support the %lu syntax, only having %ld and %d. So we go
back to casting everything into real python objects and then stringifying them, but
only for python 2.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 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
28
28
 
29
29
    def test_branch_remote_local(self):
30
30
        cmd = cmd_branch()
31
 
        cmd.run_direct(self.get_url('branch'), 'local')
 
31
        cmd.run(self.get_url('branch'), 'local')
32
32
        self.assertEquals(1, len(self.connections))
33
33
 
34
34
    def test_branch_local_remote(self):
35
35
        cmd = cmd_branch()
36
 
        cmd.run_direct('branch', self.get_url('remote'))
 
36
        cmd.run('branch', self.get_url('remote'))
37
37
        self.assertEquals(1, len(self.connections))
38
38
 
39
39
    def test_branch_remote_remote(self):
40
40
        cmd = cmd_branch()
41
 
        cmd.run_direct(self.get_url('branch'), self.get_url('remote'))
 
41
        cmd.run(self.get_url('branch'), self.get_url('remote'))
42
42
        self.assertEquals(2, len(self.connections))
43
43