(maint) Fix failing test.

The test was wrong (inadvertent inclusion of an unexpected error while
testing ability to catch a different problem).
Merge branch 'master' of https://github.com/puppetlabs/puppet