/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_subsume.py

  • Committer: adwi2
  • Date: 2008-07-11 23:05:17 UTC
  • mto: This revision was merged to the branch mainline in revision 3550.
  • Revision ID: adwi2@014661-xp-20080711230517-6giupapiqdpuduir
Permits Windows to serve all paths on all drives.

 1) Special case in local transport for "/" on Windows
    * This is taken to be an empty base path
 2) urlutils._win32_path_(from|to)_url changes
    * file:/// == / and vice versa

This fixes the problems detailed in #240910
 * Since the server started by use of bzr+ssh:// uses '/' as a base,
   you can now access paths that are not on the root of the drive
   Python.exe is hosted on
 * You may now voluntarily serve all paths from a single server process, 
   should you find this desirable

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib import bzrdir, errors, repository, workingtree, tests
18
18
 
49
49
        """
50
50
        base_tree, sub_tree = self.make_trees(format='knit',
51
51
                                              same_root=True)
52
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
52
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
53
53
                          sub_tree)
54
54
 
55
55
    def test_knit1_failure(self):
56
56
        base_tree, sub_tree = self.make_trees(format='knit')
57
 
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume,
 
57
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume, 
58
58
                          sub_tree)
59
59
 
60
60
    def test_subsume_tree(self):
100
100
        if base_tree.get_root_id() == sub_tree.get_root_id():
101
101
            raise tests.TestSkipped('This test requires unique roots')
102
102
        sub_root_id = sub_tree.get_root_id()
103
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
103
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
104
104
                          base_tree)
105
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
105
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
106
106
                          base_tree)
107
107
        self.build_tree(['subtree2/'])
108
108
        sub_tree2 = self.make_branch_and_tree('subtree2')
109
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
109
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
110
110
                          sub_tree2)
111
111
        self.build_tree(['tree/subtree/subtree3/'])
112
112
        sub_tree3 = self.make_branch_and_tree('tree/subtree/subtree3')