Skip to content

Skip test that always fails on Travis CI #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions git/test/test_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
import os

from git.test.lib import TestBase
from gitdb.test.lib import with_rw_directory
from gitdb.test.lib import skip_on_travis_ci, with_rw_directory


class Tutorials(TestBase):

@skip_on_travis_ci
@with_rw_directory
def test_init_repo_object(self, rw_dir):
# [1-test_init_repo_object]
Expand Down Expand Up @@ -165,7 +166,7 @@ def update(self, op_code, cur_count, max_count=None, message=''):
for sm in cloned_repo.submodules:
assert not sm.remove().exists() # after removal, the sm doesn't exist anymore
sm = cloned_repo.create_submodule('mysubrepo', 'path/to/subrepo', url=bare_repo.git_dir, branch='master')

# .gitmodules was written and added to the index, which is now being committed
cloned_repo.index.commit("Added submodule")
assert sm.exists() and sm.module_exists() # this submodule is defintely available
Expand Down Expand Up @@ -395,7 +396,7 @@ def test_references_and_objects(self, rw_dir):
hcommit.diff() # diff tree against index
hcommit.diff('HEAD~1') # diff tree against previous tree
hcommit.diff(None) # diff tree against working tree

index = repo.index
index.diff() # diff index against itself yielding empty diff
index.diff(None) # diff index against working copy
Expand Down Expand Up @@ -446,7 +447,7 @@ def test_submodules(self):
sm = sms[0]
assert sm.name == 'gitdb' # git-python has gitdb as single submodule ...
assert sm.children()[0].name == 'smmap' # ... which has smmap as single submodule

# The module is the repository referenced by the submodule
assert sm.module_exists() # the module is available, which doesn't have to be the case.
assert sm.module().working_tree_dir.endswith('gitdb')
Expand All @@ -458,7 +459,7 @@ def test_submodules(self):
assert sm.config_reader().get_value('path') == sm.path
assert len(sm.children()) == 1 # query the submodule hierarchy
# ![1-test_submodules]

@with_rw_directory
def test_add_file_and_commit(self, rw_dir):
import git
Expand Down