Merge lp:~jml/testtools/address-0.9.18-release-issues into lp:~testtools-committers/testtools/trunk

[Jonathan Lange]

Fix Python 3 cosmetic errors and include matcher tests in the release

Attacks the cosmetic Python 3.3 errors by sorting dict output.

Includes the matcher tests, allowing the tests to be run from the tarball.

[lp:~jml/testtools/address-0.9.18-release-issues]

286. By Jonathan Lange on 2012-10-19

Broaden the check to include PermissionError.

[Martin Packman (gz)]

Looks good overall.

+ if sys.version_info > (3, 3):
+ return "FileExistsError"

As discussed on IRC, Python 3.3 makes the exception name we should expect platform-dependant, so would be best to allow either using MatchesRegex or similar.

+ if sys.version_info > (3, 3):
+ error = 'TypeError'
+ else:
+ error = 'SyntaxError'
+ self.assertIn(self._as_output("\n%s: " % (error,)), textoutput)

Just ran this with the pre-release Python 3.3 I had installed and the test failed. Probably wants the same treatment of just accepting both exception names, rather than using a version check?

review: Needs Fixing

[Martin Packman (gz)]

And the change to the OSError name has been pushed, so this can be landed.

review: Approve

[lp:~jml/testtools/address-0.9.18-release-issues]

287. By Jonathan Lange on 2012-10-19

Address mgz's comment.