[MERGE] test framework distinguishes skips

[Aaron Bentley]

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

John Arbash Meinel wrote:
> 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.

I agreed with you that it was ugly to say library='diff'.

But your request was pretty painful to satisfy while maintaining API
stability.  It would have meant turning .dependency into a deprecated
property, turning the library parameter of __init__ into a deprecated
parameter, etc.

This made me realize that I was twisting things out of shape.  That
DependencyNotPresent was actually a misnamed LibraryNotPresent, and that
the right way to express the similarity between a missing diff3 and a
missing paramiko would be to have DependencyNotPresent and NoDiff3
inherit from a new superclass, which I would have called DependencyFailure.

So I was happy to revert NoDiff and NoDiff3 instead of doing all that.

Thanks for the +1.  I won't commit it immediately unless I get another +1.

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

iD8DBQFEsl1d0F+nu1YWqI0RAt98AJ9p308utcvwaCwSmfBjfE6Iq0dT4ACgg0Am
yS7exMgk9gYR/PXVqKtdUZM=
=+O7h
-----END PGP SIGNATURE-----