← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Robert Collins
  • Date: 2005-10-08 08:45:42 UTC
  • Revision ID: robertc@robertcollins.net-20051008084542-48ea5a99756f970e
add rm alias to remove

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
694
694
            runbzr('remove d2/link1')
695
695
            assert self.capture('unknowns') == 'd2/link1\n'
696
696
            runbzr(['commit', '-m', '5: remove d2/link1'])
 
697
            # try with the rm alias
 
698
            runbzr('add d2/link1')
 
699
            runbzr(['commit', '-m', '6: add d2/link1'])
 
700
            runbzr('rm d2/link1')
 
701
            assert self.capture('unknowns') == 'd2/link1\n'
 
702
            runbzr(['commit', '-m', '7: remove d2/link1'])
697
703
    
698
704
            os.mkdir("d1")
699
705
            runbzr('add d1')
700
706
            runbzr('rename d2/link3 d1/link3new')
701
707
            assert self.capture('unknowns') == 'd2/link1\n'
702
 
            runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
 
708
            runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
703
709
            
704
710
            runbzr(['check'])
705
711
            
737
743
            assert listdir_sorted("d2")== [ "link3" ]
738
744
            chdir("..")
739
745
            
740
 
            runbzr(['export', '-r', '6', 'exp6.tmp'])
 
746
            runbzr(['export', '-r', '8', 'exp6.tmp'])
741
747
            chdir("exp6.tmp")
742
 
            assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
 
748
            self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
743
749
            assert listdir_sorted("d1") == [ "link3new" ]
744
750
            assert listdir_sorted("d2") == []
745
751
            assert os.readlink("d1/link3new") == "NOWHERE3"