~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-08 07:05:00 UTC
  • mfrom: (3376.2.15 no-asserts)
  • Revision ID: pqm@pqm.ubuntu.com-20080508070500-9zyyvsk0eev20t4w
(mbp) remove and disallow assert statements

Show diffs side-by-side

added added

removed removed

Lines of Context:
85
85
        restore('hello.sploo')
86
86
        self.assertEqual(len(tree.conflicts()), 0)
87
87
        self.assertFileEqual('hello world2', 'hello')
88
 
        assert not os.path.lexists('hello.sploo')
 
88
        self.assertFalse(os.path.lexists('hello.sploo'))
89
89
        self.assertRaises(NotConflicted, restore, 'hello')
90
90
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
91
91