[MERGE] test framework distinguishes skips

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Martin Pool wrote:
>>>> 2. dependency_failure(LSProfNotPresent) has morphed into
>>>> depends_on('lsprof')
> 
>>> My preference would be @skip_on_dependency_error((LSProfNotPresent),
>>> which I think is what John wanted too.
> 
>>> If we can resolve #2 above then I'm +1 to merge this in.
> 
> How's this?
> 
> Aaron

...

- -class NoDiff(DependencyNotPresent):
+class NoDiff(BzrNewError):
     """Diff is not installed on this machine: %(msg)s"""

     def __init__(self, msg):
- -        super(NoDiff, self).__init__('diff', Exception(msg))
- -
- -
- -class NoDiff3(DependencyNotPresent):
+        super(NoDiff, self).__init__(msg=msg)
+
+
+class NoDiff3(BzrNewError):
     """Diff3 is not installed on this machine."""

- -    def __init__(self):
- -        DependencyNotPresent.__init__(self, 'diff3', None)
- -

I actually kind of liked them being a 'DependencyNotPresent', just that
they weren't libraries. Which to me meant more that it should be
.dependency, more than .library. But I'm okay either way.

The rest has my +1.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEslX/JdeBCYSNAAMRAjXjAKC8CO8cP+TWzVqVbyhv+7gZFceAVwCgwLdR
mbTYS+kWqOuWUZffUp5fjv8=
=EbGr
-----END PGP SIGNATURE-----