From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Jul 2006 12:31:48 +0000 (+0200)
Subject: FIx conversion tests.
X-Git-Tag: bzr-svn-0.1~25
X-Git-Url: http://git.samba.org/samba.git/?p=jelmer%2Fsubvertpy.git;a=commitdiff_plain;h=e3a599e5df9ce08f6b60d23109cf972a7e9c6971

FIx conversion tests.
---

diff --git a/tests/test_convert.py b/tests/test_convert.py
index d65ad6c5..b9e89a14 100644
--- a/tests/test_convert.py
+++ b/tests/test_convert.py
@@ -21,6 +21,7 @@ from bzrlib.repository import Repository
 
 import os
 from convert import convert_repository
+from scheme import TrunkBranchingScheme
 from tests import TestCaseWithSubversionRepository
 
 class TestConversion(TestCaseWithSubversionRepository):
@@ -31,18 +32,22 @@ class TestConversion(TestCaseWithSubversionRepository):
         self.client_add("dc/trunk")
         self.client_add("dc/branches")
         self.client_commit("dc", "create repos")
+        self.build_tree({'dc/trunk/file': 'otherdata'})
+        self.client_commit("dc", "change")
 
     def test_shared_import(self):
-        convert_repository("svn+"+self.repos_url+"/trunk", "e", True)
+        convert_repository("svn+"+self.repos_url, "e", 
+                TrunkBranchingScheme(), True)
 
         self.assertTrue(Repository.open("e").is_shared())
     
     def test_simple(self):
-        convert_repository("svn+"+self.repos_url+"/trunk", "e")
-        #self.assertTrue(os.path.isdir(os.path.join(self.test_dir, "e", "trunk")))
-        #self.assertTrue(os.path.isdir(os.path.join(self.test_dir, "e", "branches", "abranch")))
+        convert_repository("svn+"+self.repos_url, os.path.join(self.test_dir, "e"), TrunkBranchingScheme())
+        self.assertTrue(os.path.isdir(os.path.join(self.test_dir, "e", "trunk")))
+        self.assertTrue(os.path.isdir(os.path.join(self.test_dir, "e", "branches", "abranch")))
 
     def test_notshared_import(self):
-        convert_repository("svn+"+self.repos_url+"/trunk", "e", False)
+        convert_repository("svn+"+self.repos_url, "e", TrunkBranchingScheme(), 
+                           False)
 
         self.assertRaises(NotBranchError, Repository.open, "e")