Merge "Remove unnecessary check for pytest.skip"