Make H202 work again

I75c5cab81398f4cde5840b3b2082bd1f6ccb2661 broke H202, and made it check
for 'self.assertRaises(Exception)' instead of
'self.assertRaises(Exception,'

This fixes that, because this is essentially adding a new check this
requires a hacking 0.7 release.

Fixes bug 1206302

Change-Id: I7e7243a9937216c38093f6fd0ff983d50cfea5c4
Merge "Make H202 work again"