Convert two instances of assertTrue() and string matching usages to self.expect()

which is more descriptive.  And wrap the file open operation inside a with block
so that close() is automatically called upon exiting the block.

llvm-svn: 116096