Either way, something isn't right about how it's integrated now.  With
the patch, this:

    @unittest.expectedFailure
    def test(self):
        with self.subTest():
            self.assertEqual(0, 1)

gives: FAILED (failures=1, unexpected successes=1)

And this:

    @unittest.expectedFailure
    def test(self):
        with self.subTest():
            self.assertEqual(0, 0)

gives: OK (unexpected successes=1)

But without the patch, this:

    @unittest.expectedFailure
    def test(self):
        self.assertEqual(0, 1)

gives: OK (expected failures=1)