More py2.6 adjustment for the unit-tests

The underlying problem being that  the ability to use assertRaises() as
a context manager was added in py2.7.