diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 10:54:57 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 10:54:57 +0100 |
| commit | acac4bb07af3f168e10eee392a74a06e124d1cdd (patch) | |
| tree | 98487d30df5bbcbfe54ed59cc1059dbde6251fc5 | |
| parent | c255c14e9eb15f4ff29a4baead3ed31a9943e04e (diff) | |
| download | gitpython-acac4bb07af3f168e10eee392a74a06e124d1cdd.tar.gz | |
Let's hope travis works now
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | git/test/test_repo.py | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 2acd16be..c56b9d43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,10 @@ install: - pip install coveralls # for now we have to make sure there is a master branch - at some point we should just have it by default - - git branch master + - git branch master 0.3 # generate some reflog as git-python tests need it (in 0.3) + - git checkout 0.3 - git reset --hard HEAD~1 - git reset --hard HEAD~1 - git reset --hard HEAD~1 @@ -30,11 +31,6 @@ install: # as commits are performed with the default user, it needs to be set for travis too - git config --global user.email "travis@ci.com" - git config --global user.name "Travis Runner" - - # DEBUG - - cat /home/travis/build/gitpython-developers/GitPython/.git/logs/refs/heads/0.3 - - cat /home/travis/build/gitpython-developers/GitPython/.git/logs/refs/heads/master - - cat /home/travis/build/gitpython-developers/GitPython/.git/logs/HEAD script: - nosetests -v --with-coverage after_success: diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 1079cd04..d4069670 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -588,8 +588,6 @@ class TestRepo(TestBase): self.failUnlessRaises(NotImplementedError, rev_parse, "@{1 week ago}") # the last position - # For some reason, this test fails on travis - even though there is a rev log - # from all I see there. assert rev_parse('@{1}') != head.commit def test_repo_odbtype(self): |