~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to test_grep.py

  • Committer: Parth Malwankar
  • Date: 2010-03-15 06:58:56 UTC
  • mto: (0.44.2 grep) (6531.3.1 merge-grep)
  • mto: This revision was merged to the branch mainline in revision 6555.
  • Revision ID: parth.malwankar@gmail.com-20100315065856-wgm98rnci283hd0u
removed duplicate test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
368
368
        self.assertTrue(self._str_contains(out, "^file1.aa:line1"))
369
369
        self.assertFalse(self._str_contains(out, "file0.txt"))
370
370
 
371
 
 
372
 
    def test_ver_files_from_outside_dir(self):
373
 
        """(versioned) Grep for pattern with dirs passed as argument.
374
 
        """
375
 
        wd = 'foobar0'
376
 
        self.make_branch_and_tree(wd)
377
 
        os.chdir(wd)
378
 
 
379
 
        self._mk_versioned_dir('dir0')
380
 
        self._mk_versioned_file('dir0/file0.txt')
381
 
 
382
 
        self._mk_versioned_dir('dir1')
383
 
        self._mk_versioned_file('dir1/file1.txt')
384
 
 
385
 
        out, err = self.run_bzr(['grep', '-r', 'last:1', 'line1', 'dir0', 'dir1'])
386
 
        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~.:line1"))
387
 
        self.assertTrue(self._str_contains(out, "^dir1/file1.txt~.:line1"))
388
 
 
389
371
    def test_versioned_include_from_outside_dir(self):
390
372
        """(versioned) Ensure --include is respected during recursive search.
391
373
        """