Rev 4863: (vila) Skip tests that needs a bzr source tree when there isn't one. in file:///home/pqm/archives/thelove/bzr/2.1/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Sat Sep 25 12:18:48 BST 2010


At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4863 [merge]
revision-id: pqm at pqm.ubuntu.com-20100925111846-8f2rjt5xu7qvatkt
parent: pqm at pqm.ubuntu.com-20100924043554-6vth0ppq1tyfsq8i
parent: v.ladeuil+lp at free.fr-20100925104419-agde0gyk95z9vt1b
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Sat 2010-09-25 12:18:46 +0100
message:
  (vila) Skip tests that needs a bzr source tree when there isn't one.
   (#644855) (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'NEWS'
--- a/NEWS	2010-09-23 16:37:27 +0000
+++ b/NEWS	2010-09-25 10:41:08 +0000
@@ -19,6 +19,10 @@
 Bug Fixes
 *********
 
+* Skip tests that needs a bzr source tree when there isn't one. This is
+  needed to succesfully run the test suite for installed versions.
+  (Vincent Ladeuil, #644855).
+
 * Skip the tests that requires respecting the chmod bits when running as root.
   (Vincent Ladeuil, #646133)
 

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-07-19 10:37:26 +0000
+++ b/bzrlib/tests/__init__.py	2010-09-23 13:52:55 +0000
@@ -970,7 +970,7 @@
             try:
                 workingtree.WorkingTree.open(path)
             except (errors.NotBranchError, errors.NoWorkingTree):
-                return
+                raise TestSkipped('Needs a working tree of bzr sources')
         finally:
             self.enable_directory_isolation()
 




More information about the bazaar-commits mailing list