Use pytest.skip instead of unittest.SkipTest (#2461)

Use pytest.skip instead of unittest.SkipTest (#2461) #1716