Comment 4 for bug 1886589

Lajos, tests pass with your patch plus a slight modification. I had to add mock to test-requirements.txt. I tested successfully with "mock==3.0.5" and unversioned "mock".