← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_smart_add.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:
bzrlib/tests/per_workingtree/test_smart_add.py
1
 
# Copyright (C) 2007, 2009-2012, 2016 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
102
102
        self.overrideAttr(trace, 'warning', warning)
103
103
        wt.smart_add((u".",))
104
104
        self.assertIs(wt.path2id("nested"), None)
105
 
        self.assertEqual(
 
105
        self.assertEquals(
106
106
            ['skipping nested tree %r' % nested_wt.basedir], warnings)
107
107
 
108
108
    def test_add_dot_from_subdir(self):
135
135
 
136
136
        self.build_tree(build_paths)
137
137
        wt = self.make_branch_and_tree('.')
138
 
        if wt.user_url != wt.branch.user_url:
139
 
            # Lightweight checkout, make sure we have a repo location.
140
 
            wt.branch.bzrdir.root_transport.mkdir('original')
141
138
        child_tree = self.make_branch_and_tree('original/child')
142
139
        wt.smart_add((".",))
143
140
        for path in paths: