Update test_threading with a couple changes from trunk that got lost due, I presume, to merge conflicts.
Update test_threading with a couple changes from trunk that got lost due, I
presume, to merge conflicts.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator