Skip to content

cherry-picker: Run Travis CI test on Windows #311

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.

Sign up for GitHub

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 8 commits into from
Mar 16, 2019
Merged

cherry-picker: Run Travis CI test on Windows #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5eb4d83
cherry-picker: Run Travis CI test on Windows
encukou Feb 22, 2019
c9a3c8b
Use explicit block literal in before_install in Travis
webknjaz Mar 15, 2019
3cefad1
Use declarative way of setting up env vars
webknjaz Mar 15, 2019
bcb89e3
🐛✅ Set up Git user name and email in tests
webknjaz Mar 15, 2019
ae151c6
✅🎨 Use fixtures in find config tests
webknjaz Mar 15, 2019
0263b57
✅🎨 Use fixtures in load config tests
webknjaz Mar 15, 2019
683c3a8
🚑Use pathlib's write_text for saving test config
webknjaz Mar 15, 2019
e7c0d2b
🚑 Use UTF-8 encoding for saving test config
webknjaz Mar 15, 2019
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
16 changes: 15 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ sudo: false
cache: pip

before_install:
- pip install --upgrade flit
- &install-flit >-
pip install --upgrade flit

.mixtures:
- &run-if-tagged
Expand Down Expand Up @@ -99,6 +100,19 @@ jobs:
env:
TARGET_PKG: cherry_picker

- os: windows
language: sh
python: 3.7
before_install:
- choco install python --version 3.7
- python -m pip install --upgrade pip wheel
- *install-flit
<<: *install-and-test-cherry-picker
env:
PATH: >-
/c/Python37:/c/Python37/Scripts:$PATH
TARGET_PKG: cherry_picker

- <<: *deploy-base
<<: *run-if-blurb
if: 1 != 1
Expand Down
60 changes: 31 additions & 29 deletions cherry_picker/cherry_picker/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,19 @@ def git_cherry_pick():


@pytest.fixture
def tmp_git_repo_dir(tmpdir, cd, git_init, git_commit):
def git_config():
git_config_cmd = 'git', 'config'
return lambda *extra_args: (
subprocess.run(git_config_cmd + extra_args, check=True)
)


@pytest.fixture
def tmp_git_repo_dir(tmpdir, cd, git_init, git_commit, git_config):
cd(tmpdir)
git_init()
git_config('--local', 'user.name', 'Monty Python')
git_config('--local', 'user.email', 'bot@python.org')
git_commit('Initial commit', '--allow-empty')
yield tmpdir

Expand Down Expand Up @@ -258,22 +268,16 @@ def test_is_not_cpython_repo():
["3.6"])


def test_find_config(tmpdir, cd):
cd(tmpdir)
subprocess.run('git init .'.split(), check=True)
def test_find_config(tmp_git_repo_dir, git_add, git_commit):
relative_config_path = '.cherry_picker.toml'
cfg = tmpdir.join(relative_config_path)
cfg.write('param = 1')
subprocess.run('git add .'.split(), check=True)
subprocess.run(('git', 'commit', '-m', 'Initial commit'), check=True)
tmp_git_repo_dir.join(relative_config_path).write('param = 1')
git_add(relative_config_path)
git_commit('Add config')
scm_revision = get_sha1_from('HEAD')
assert find_config(scm_revision) == scm_revision + ':' + relative_config_path
assert find_config(scm_revision) == f'{scm_revision}:{relative_config_path}'


def test_find_config_not_found(tmpdir, cd):
cd(tmpdir)
subprocess.run('git init .'.split(), check=True)
subprocess.run(('git', 'commit', '-m', 'Initial commit', '--allow-empty'), check=True)
def test_find_config_not_found(tmp_git_repo_dir):
scm_revision = get_sha1_from('HEAD')
assert find_config(scm_revision) is None

Expand All @@ -283,19 +287,16 @@ def test_find_config_not_git(tmpdir, cd):
assert find_config(None) is None


def test_load_full_config(tmpdir, cd):
cd(tmpdir)
subprocess.run('git init .'.split(), check=True)
def test_load_full_config(tmp_git_repo_dir, git_add, git_commit):
relative_config_path = '.cherry_picker.toml'
cfg = tmpdir.join(relative_config_path)
cfg.write('''\
tmp_git_repo_dir.join(relative_config_path).write('''\
team = "python"
repo = "core-workfolow"
check_sha = "5f007046b5d4766f971272a0cc99f8461215c1ec"
default_branch = "devel"
''')
subprocess.run('git add .'.split(), check=True)
subprocess.run(('git', 'commit', '-m', 'Initial commit'), check=True)
git_add(relative_config_path)
git_commit('Add config')
scm_revision = get_sha1_from('HEAD')
cfg = load_config(None)
assert cfg == (
Expand All @@ -310,16 +311,13 @@ def test_load_full_config(tmpdir, cd):
)


def test_load_partial_config(tmpdir, cd):
cd(tmpdir)
subprocess.run('git init .'.split(), check=True)
def test_load_partial_config(tmp_git_repo_dir, git_add, git_commit):
relative_config_path = '.cherry_picker.toml'
cfg = tmpdir.join(relative_config_path)
cfg.write('''\
tmp_git_repo_dir.join(relative_config_path).write('''\
repo = "core-workfolow"
''')
subprocess.run('git add .'.split(), check=True)
subprocess.run(('git', 'commit', '-m', 'Initial commit'), check=True)
git_add(relative_config_path)
git_commit('Add config')
scm_revision = get_sha1_from('HEAD')
cfg = load_config(relative_config_path)
assert cfg == (
Expand Down Expand Up @@ -417,7 +415,9 @@ def test_from_git_rev_read_negative(
def test_from_git_rev_read_uncommitted(tmp_git_repo_dir, git_add, git_commit):
some_text = 'blah blah 🤖'
relative_file_path = '.some.file'
tmp_git_repo_dir.join(relative_file_path).write(some_text)
(
pathlib.Path(tmp_git_repo_dir) / relative_file_path
).write_text(some_text, encoding='utf-8')
git_add('.')
with pytest.raises(ValueError):
from_git_rev_read('HEAD:' + relative_file_path) == some_text
Expand All @@ -426,7 +426,9 @@ def test_from_git_rev_read_uncommitted(tmp_git_repo_dir, git_add, git_commit):
def test_from_git_rev_read(tmp_git_repo_dir, git_add, git_commit):
some_text = 'blah blah 🤖'
relative_file_path = '.some.file'
tmp_git_repo_dir.join(relative_file_path).write(some_text)
(
pathlib.Path(tmp_git_repo_dir) / relative_file_path
).write_text(some_text, encoding='utf-8')
git_add('.')
git_commit('Add some file')
assert from_git_rev_read('HEAD:' + relative_file_path) == some_text
Expand Down