Skip to content

Commit 1c816d0

Browse files
committed
πŸπŸŒšπŸ€– Formatted using black.
1 parent e6e6c97 commit 1c816d0

File tree

1 file changed

+39
-37
lines changed

1 file changed

+39
-37
lines changed

β€Žcherry_picker/cherry_picker/test.pyβ€Ž

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,17 @@ def git_cherry_pick():
9494

9595
@pytest.fixture
9696
def git_config():
97-
git_config_cmd = 'git', 'config'
98-
return lambda *extra_args: (
99-
subprocess.run(git_config_cmd + extra_args, check=True)
100-
)
97+
git_config_cmd = "git", "config"
98+
return lambda *extra_args: (subprocess.run(git_config_cmd + extra_args, check=True))
10199

102100

103101
@pytest.fixture
104102
def tmp_git_repo_dir(tmpdir, cd, git_init, git_commit, git_config):
105103
cd(tmpdir)
106104
git_init()
107-
git_config('--local', 'user.name', 'Monty Python')
108-
git_config('--local', 'user.email', '[email protected]')
109-
git_commit('Initial commit', '--allow-empty')
105+
git_config("--local", "user.name", "Monty Python")
106+
git_config("--local", "user.email", "[email protected]")
107+
git_commit("Initial commit", "--allow-empty")
110108
yield tmpdir
111109

112110

@@ -307,16 +305,16 @@ def test_is_not_cpython_repo():
307305

308306

309307
def test_find_config(tmp_git_repo_dir, git_add, git_commit):
310-
relative_config_path = '.cherry_picker.toml'
311-
tmp_git_repo_dir.join(relative_config_path).write('param = 1')
308+
relative_config_path = ".cherry_picker.toml"
309+
tmp_git_repo_dir.join(relative_config_path).write("param = 1")
312310
git_add(relative_config_path)
313-
git_commit('Add config')
314-
scm_revision = get_sha1_from('HEAD')
315-
assert find_config(scm_revision) == f'{scm_revision}:{relative_config_path}'
311+
git_commit("Add config")
312+
scm_revision = get_sha1_from("HEAD")
313+
assert find_config(scm_revision) == f"{scm_revision}:{relative_config_path}"
316314

317315

318316
def test_find_config_not_found(tmp_git_repo_dir):
319-
scm_revision = get_sha1_from('HEAD')
317+
scm_revision = get_sha1_from("HEAD")
320318
assert find_config(scm_revision) is None
321319

322320

@@ -326,16 +324,18 @@ def test_find_config_not_git(tmpdir, cd):
326324

327325

328326
def test_load_full_config(tmp_git_repo_dir, git_add, git_commit):
329-
relative_config_path = '.cherry_picker.toml'
330-
tmp_git_repo_dir.join(relative_config_path).write('''\
327+
relative_config_path = ".cherry_picker.toml"
328+
tmp_git_repo_dir.join(relative_config_path).write(
329+
"""\
331330
team = "python"
332331
repo = "core-workfolow"
333332
check_sha = "5f007046b5d4766f971272a0cc99f8461215c1ec"
334333
default_branch = "devel"
335-
''')
334+
"""
335+
)
336336
git_add(relative_config_path)
337-
git_commit('Add config')
338-
scm_revision = get_sha1_from('HEAD')
337+
git_commit("Add config")
338+
scm_revision = get_sha1_from("HEAD")
339339
cfg = load_config(None)
340340
assert cfg == (
341341
scm_revision + ":" + relative_config_path,
@@ -350,13 +350,15 @@ def test_load_full_config(tmp_git_repo_dir, git_add, git_commit):
350350

351351

352352
def test_load_partial_config(tmp_git_repo_dir, git_add, git_commit):
353-
relative_config_path = '.cherry_picker.toml'
354-
tmp_git_repo_dir.join(relative_config_path).write('''\
353+
relative_config_path = ".cherry_picker.toml"
354+
tmp_git_repo_dir.join(relative_config_path).write(
355+
"""\
355356
repo = "core-workfolow"
356-
''')
357+
"""
358+
)
357359
git_add(relative_config_path)
358-
git_commit('Add config')
359-
scm_revision = get_sha1_from('HEAD')
360+
git_commit("Add config")
361+
scm_revision = get_sha1_from("HEAD")
360362
cfg = load_config(relative_config_path)
361363
assert cfg == (
362364
f"{scm_revision}:{relative_config_path}",
@@ -454,25 +456,25 @@ def test_from_git_rev_read_negative(input_path, tmp_git_repo_dir):
454456

455457

456458
def test_from_git_rev_read_uncommitted(tmp_git_repo_dir, git_add, git_commit):
457-
some_text = 'blah blah πŸ€–'
458-
relative_file_path = '.some.file'
459-
(
460-
pathlib.Path(tmp_git_repo_dir) / relative_file_path
461-
).write_text(some_text, encoding='utf-8')
462-
git_add('.')
459+
some_text = "blah blah πŸ€–"
460+
relative_file_path = ".some.file"
461+
(pathlib.Path(tmp_git_repo_dir) / relative_file_path).write_text(
462+
some_text, encoding="utf-8"
463+
)
464+
git_add(".")
463465
with pytest.raises(ValueError):
464466
from_git_rev_read("HEAD:" + relative_file_path) == some_text
465467

466468

467469
def test_from_git_rev_read(tmp_git_repo_dir, git_add, git_commit):
468-
some_text = 'blah blah πŸ€–'
469-
relative_file_path = '.some.file'
470-
(
471-
pathlib.Path(tmp_git_repo_dir) / relative_file_path
472-
).write_text(some_text, encoding='utf-8')
473-
git_add('.')
474-
git_commit('Add some file')
475-
assert from_git_rev_read('HEAD:' + relative_file_path) == some_text
470+
some_text = "blah blah πŸ€–"
471+
relative_file_path = ".some.file"
472+
(pathlib.Path(tmp_git_repo_dir) / relative_file_path).write_text(
473+
some_text, encoding="utf-8"
474+
)
475+
git_add(".")
476+
git_commit("Add some file")
477+
assert from_git_rev_read("HEAD:" + relative_file_path) == some_text
476478

477479

478480
def test_states(tmp_git_repo_dir):

0 commit comments

Comments
Β (0)