add a test for pushing after a failed pull. This works now but was marked as xfail in py.test. This worries me somewhat, did I port the test incorrectly?