← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_version.py

  • Committer: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_version.py
26
26
        out = self.run_bzr("version")[0]
27
27
        self.assertTrue(len(out) > 0)
28
28
        self.assertEquals(1, out.count(bzrlib.__version__))
29
 
        self.assertContainsRe(out, r"(?m)^  Python interpreter:")
30
 
        self.assertContainsRe(out, r"(?m)^  Python standard library:")
31
 
        self.assertContainsRe(out, r"(?m)^  bzrlib:")
32
 
        self.assertContainsRe(out, r"(?m)^  Bazaar configuration:")
33
 
        self.assertContainsRe(out, r'(?m)^  Bazaar log file:.*bzr\.log')
 
29
        self.assertEquals(1, out.count("Using python interpreter:"))
 
30
        self.assertEquals(1, out.count("Using python standard library:"))
 
31
        self.assertEquals(1, out.count("Using bzrlib:"))
 
32
        self.assertEquals(1, out.count("Using bazaar configuration:"))