def test_filter_out(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'empty-ex-filter')
with dist_path.as_cwd():
common.prep_patches_branch()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True, filtered=True)
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
commit_after = git('rev-parse', 'HEAD')
common.assert_distgit(dist_path, 'patched-filter')
assert commit_before != commit_after, "New commit not created"
def test_filter_out(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'empty-ex-filter')
with dist_path.as_cwd():
common.prep_patches_branch()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True, filtered=True)
update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
commit_after = git('rev-parse', 'HEAD')
common.assert_distgit(dist_path, 'patched-filter')
assert commit_before != commit_after, "New commit not created"
def test_update_dense(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'empty-dense')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch()
spec_before = spec_path.read()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True)
update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
common.assert_distgit(dist_path, 'patched-dense')
assert commit_before != commit_after, "New commit not created"
def test_update_dense(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'empty-dense')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch(dist_path)
spec_before = spec_path.read()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True)
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
common.assert_distgit(dist_path, 'patched-dense')
assert commit_before != commit_after, "New commit not created"
def test_update_autosetup(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'autosetup')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch()
spec_before = spec_path.read()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True)
update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
apply_method = specfile.Spec().patches_apply_method()
assert apply_method == 'autosetup'
common.assert_distgit(dist_path, 'patched-autosetup')
assert commit_before != commit_after, "New commit not created"
def test_update_git_am_buildarch_fail(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'git-am-fail')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch()
spec_before = spec_path.read()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True)
with pytest.raises(rdopkg.utils.exception.BuildArchSanityCheckFailed):
update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
apply_method = specfile.Spec().patches_apply_method()
assert apply_method == 'git-am'
assert commit_before == commit_after, "New commit created"
def test_update_autosetup(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'autosetup')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch(dist_path)
spec_before = spec_path.read()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True)
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
apply_method = specfile.Spec().patches_apply_method()
assert apply_method == 'autosetup'
common.assert_distgit(dist_path, 'patched-autosetup')
assert commit_before != commit_after, "New commit not created"
def test_update_git_am_buildarch_fail(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'git-am-fail')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch(dist_path)
spec_before = spec_path.read()
commit_before = git('rev-parse', 'HEAD')
common.add_patches(extra=True)
with pytest.raises(rdopkg.utils.exception.BuildArchSanityCheckFailed):
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
apply_method = specfile.Spec().patches_apply_method()
assert apply_method == 'git-am'
assert commit_before == commit_after, "New commit created"
def test_update_noop(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'patched')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch()
spec_before = spec_path.read()
common.add_patches()
update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
assert spec_after == spec_before
commit_before = git('rev-parse', 'HEAD')
update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
commit_after = git('rev-parse', 'HEAD')
assert commit_before == commit_after, "Commit created for no-op"
def _test_new_version(asset, dir, steps):
dist_path = common.prep_spec_test(dir, asset)
spec_path = dist_path.join('foo.spec')
log.log.setLevel(log.WARN)
with dist_path.as_cwd():
common.prep_patches_branch()
for new_version, spec_version, spec_release_parts, spec_milestone \
in steps:
commit_before = git('rev-parse', 'HEAD')
common.add_patches(tag=new_version)
rdopkg('new-version', '-l', '-d', new_version)
# after
commit_after = git('rev-parse', 'HEAD')
common.assert_spec_version(spec_version, spec_release_parts,
spec_milestone)
assert commit_before != commit_after
def test_update_noop(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'patched')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch(dist_path)
spec_before = spec_path.read()
common.add_patches()
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
assert spec_after == spec_before
commit_before = git('rev-parse', 'HEAD')
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
commit_after = git('rev-parse', 'HEAD')
assert commit_before == commit_after, "Commit created for no-op"
def _test_patch(asset, version, dir):
dist_path = common.prep_spec_test(dir, asset)
spec_path = dist_path.join('foo.spec')
log.log.setLevel(log.WARN)
with dist_path.as_cwd():
spec_version, spec_release_parts, spec_milestone = version
tag = spec_version
if spec_milestone:
tag += spec_milestone
common.prep_patches_branch(tag=tag)
commit_before = git('rev-parse', 'HEAD')
common.add_patches()
rdopkg('patch', '-l')
# after
commit_after = git('rev-parse', 'HEAD')
common.assert_spec_version(spec_version, spec_release_parts,
spec_milestone)
assert commit_before != commit_after
def test_update_empty(tmpdir):
dist_path = common.prep_spec_test(tmpdir, 'empty')
spec_path = dist_path.join('foo.spec')
with dist_path.as_cwd():
common.prep_patches_branch(dist_path)
spec_before = spec_path.read()
commit_before = git('rev-parse', 'HEAD')
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
assert spec_after == spec_before
assert commit_before == commit_after, "Commit created for no-op"
with dist_path.as_cwd():
common.add_patches()
actions.update_patches('master',
local_patches_branch='master-patches',
version='1.2.3')
spec_after = spec_path.read()
commit_after = git('rev-parse', 'HEAD')
common.assert_distgit(dist_path, 'patched')
assert commit_before != commit_after, "New commit not created"