@ -916,48 +916,6 @@ class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
' 069c602044c5388d2d15c3f875b057c852003458 \' in \' %s \' \n M \t a \n M \t b \n ' ) %
join ( self . root_dir , ' . ' ) )
def testUpdateCheckout ( self ) :
if not self . enabled :
return
options = self . Options ( verbose = True )
root_dir = gclient_scm . os . path . realpath ( tempfile . mkdtemp ( ) )
relpath = ' foo '
base_path = join ( root_dir , relpath )
url = join ( self . base_path , ' .git ' )
try :
scm = gclient_scm . CreateSCM ( url = url , root_dir = root_dir ,
relpath = relpath )
file_list = [ ]
scm . update ( options , ( ) , file_list )
self . assertEquals ( len ( file_list ) , 2 )
self . assert_ ( gclient_scm . os . path . isfile ( join ( base_path , ' a ' ) ) )
self . assertEquals ( scm . revinfo ( options , ( ) , None ) ,
' 069c602044c5388d2d15c3f875b057c852003458 ' )
finally :
rmtree ( root_dir )
msg1 = (
" \n _____ foo at refs/heads/master \n \n "
" ________ running ' git clone --progress -b master --verbose %s %s ' "
" in ' %s ' \n "
" Initialized empty Git repository in %s \n " ) % (
join ( self . root_dir , ' . ' , ' .git ' ) ,
join ( root_dir , ' foo ' ) ,
root_dir ,
join ( gclient_scm . os . path . realpath ( root_dir ) , ' foo ' , ' .git ' ) + ' / ' )
msg2 = (
" \n _____ foo at refs/heads/master \n \n "
" ________ running ' git clone --progress -b master --verbose %s %s ' "
" in ' %s ' \n "
" Cloning into ' %s ' ... \n done. \n " ) % (
join ( self . root_dir , ' . ' , ' .git ' ) ,
join ( root_dir , ' foo ' ) ,
root_dir ,
join ( gclient_scm . os . path . realpath ( root_dir ) , ' foo ' ) )
out = sys . stdout . getvalue ( )
sys . stdout . close ( )
sys . stdout = self . _old_stdout
self . assertTrue ( out in ( msg1 , msg2 ) , ( out , msg1 , msg2 ) )
def testUpdateUpdate ( self ) :
if not self . enabled :
return
@ -1230,49 +1188,6 @@ class ManagedGitWrapperTestCaseMox(BaseTestCase):
class UnmanagedGitWrapperTestCase ( BaseGitWrapperTestCase ) :
def testUpdateCheckout ( self ) :
if not self . enabled :
return
options = self . Options ( verbose = True )
root_dir = gclient_scm . os . path . realpath ( tempfile . mkdtemp ( ) )
relpath = ' foo '
base_path = join ( root_dir , relpath )
url = join ( self . base_path , ' .git ' )
try :
scm = gclient_scm . CreateSCM ( url = url , root_dir = root_dir ,
relpath = relpath )
file_list = [ ]
options . revision = ' unmanaged '
scm . update ( options , ( ) , file_list )
self . assertEquals ( len ( file_list ) , 2 )
self . assert_ ( gclient_scm . os . path . isfile ( join ( base_path , ' a ' ) ) )
self . assertEquals ( scm . revinfo ( options , ( ) , None ) ,
' 069c602044c5388d2d15c3f875b057c852003458 ' )
finally :
rmtree ( root_dir )
msg1 = (
" \n _____ foo at refs/heads/master \n \n "
" ________ running ' git clone --progress -b master --verbose %s %s ' "
" in ' %s ' \n "
" Initialized empty Git repository in %s \n " ) % (
join ( self . root_dir , ' . ' , ' .git ' ) ,
join ( root_dir , ' foo ' ) ,
root_dir ,
join ( gclient_scm . os . path . realpath ( root_dir ) , ' foo ' , ' .git ' ) + ' / ' )
msg2 = (
" \n _____ foo at refs/heads/master \n \n "
" ________ running ' git clone --progress -b master --verbose %s %s ' "
" in ' %s ' \n "
" Cloning into ' %s ' ... \n done. \n " ) % (
join ( self . root_dir , ' . ' , ' .git ' ) ,
join ( root_dir , ' foo ' ) ,
root_dir ,
join ( gclient_scm . os . path . realpath ( root_dir ) , ' foo ' ) )
out = sys . stdout . getvalue ( )
sys . stdout . close ( )
sys . stdout = self . _old_stdout
self . assertTrue ( out in ( msg1 , msg2 ) , ( out , msg1 , msg2 ) )
def testUpdateUpdate ( self ) :
if not self . enabled :
return