EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into remove-pinned-cssselect

humitos/resolver/username-regex
David Fischer 2018-03-26 11:22:17 -07:00
parent 4b3fd71370 7125a88d8d
commit dcd998b8d9
No known key found for this signature in database
GPG Key ID: F0C9B0ADA737AB60
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
readthedocs/rtd_tests/utils.py
View File

@ -59,13 +59,22 @@ def make_test_git():
gitmodules_path = pjoin(directory, '.gitmodules')
with open(gitmodules_path, 'w') as fh:
fh.write('''[submodule "foobar"]\n\tpath = foobar\n\turl = https://foobar.com/git\n''')
log.info(check_output(['git', 'update-index', '--add', '--cacheinfo', '160000', '233febf4846d7a0aeb95b6c28962e06e21d13688', 'foobar'], env=env))
log.info(check_output(
[
'git', 'update-index', '--add', '--cacheinfo', '160000',
'233febf4846d7a0aeb95b6c28962e06e21d13688', 'foobar',
],
env=env,
))
log.info(check_output(['git', 'add', '.'], env=env))
log.info(check_output(['git', 'commit', '-m"Add submodule"'], env=env))
# Add an invalid submodule URL in the invalidsubmodule branch
log.info(check_output(['git', 'checkout', '-b', 'invalidsubmodule', 'master'], env=env))
log.info(check_output(['git', 'submodule', 'add', '-b', 'master', './', 'invalidsubmodule'], env=env))
log.info(check_output(
['git', 'submodule', 'add', '-b', 'master', './', 'invalidsubmodule'],
env=env,
))
log.info(check_output(['git', 'add', '.'], env=env))
log.info(check_output(['git', 'commit', '-m"Add invalid submodule"'], env=env))
# Checkout to master branch again