moar log output

This commit is contained in:
Manuel Barkhau 2019-03-29 02:22:14 +01:00
parent b036a68a26
commit f8a1d71b7a

View file

@ -66,7 +66,7 @@ def runner(tmpdir):
def test_help(runner): def test_help(runner):
result = runner.invoke(cli.cli, ['--help', "--verbose"]) result = runner.invoke(cli.cli, ['--help', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
assert "PyCalVer" in result.output assert "PyCalVer" in result.output
assert "bump " in result.output assert "bump " in result.output
@ -76,7 +76,7 @@ def test_help(runner):
def test_version(runner): def test_version(runner):
result = runner.invoke(cli.cli, ['--version', "--verbose"]) result = runner.invoke(cli.cli, ['--version', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
assert " version v20" in result.output assert " version v20" in result.output
match = patterns.PYCALVER_RE.search(result.output) match = patterns.PYCALVER_RE.search(result.output)
@ -87,7 +87,7 @@ def test_incr_default(runner):
old_version = "v201701.0999-alpha" old_version = "v201701.0999-alpha"
initial_version = config._initial_version() initial_version = config._initial_version()
result = runner.invoke(cli.cli, ['test', "--verbose", old_version]) result = runner.invoke(cli.cli, ['test', "-vv", old_version])
assert result.exit_code == 0 assert result.exit_code == 0
new_version = initial_version.replace(".0001-alpha", ".11000-alpha") new_version = initial_version.replace(".0001-alpha", ".11000-alpha")
assert f"Version: {new_version}\n" in result.output assert f"Version: {new_version}\n" in result.output
@ -98,31 +98,31 @@ def test_incr_semver(runner):
old_version = "0.1.0" old_version = "0.1.0"
new_version = "0.1.1" new_version = "0.1.1"
result = runner.invoke(cli.cli, ['test', "--verbose", "--patch", old_version, "{semver}"]) result = runner.invoke(cli.cli, ['test', "-vv", "--patch", old_version, "{semver}"])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Version: {new_version}\n" in result.output assert f"Version: {new_version}\n" in result.output
result = runner.invoke(cli.cli, ['test', "--verbose", "--patch", old_version, semver_pattern]) result = runner.invoke(cli.cli, ['test', "-vv", "--patch", old_version, semver_pattern])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Version: {new_version}\n" in result.output assert f"Version: {new_version}\n" in result.output
old_version = "0.1.1" old_version = "0.1.1"
new_version = "0.2.0" new_version = "0.2.0"
result = runner.invoke(cli.cli, ['test', "--verbose", "--minor", old_version, semver_pattern]) result = runner.invoke(cli.cli, ['test', "-vv", "--minor", old_version, semver_pattern])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Version: {new_version}\n" in result.output assert f"Version: {new_version}\n" in result.output
old_version = "0.1.1" old_version = "0.1.1"
new_version = "1.0.0" new_version = "1.0.0"
result = runner.invoke(cli.cli, ['test', "--verbose", "--major", old_version, semver_pattern]) result = runner.invoke(cli.cli, ['test', "-vv", "--major", old_version, semver_pattern])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Version: {new_version}\n" in result.output assert f"Version: {new_version}\n" in result.output
def test_incr_semver_invalid(runner, caplog): def test_incr_semver_invalid(runner, caplog):
result = runner.invoke(cli.cli, ['test', "--verbose", "--patch", "0.1.1"]) result = runner.invoke(cli.cli, ['test', "-vv", "--patch", "0.1.1"])
assert result.exit_code == 1 assert result.exit_code == 1
assert len(caplog.records) > 0 assert len(caplog.records) > 0
log_record = caplog.records[0] log_record = caplog.records[0]
@ -134,7 +134,7 @@ def test_incr_to_beta(runner):
old_version = "v201701.0999-alpha" old_version = "v201701.0999-alpha"
initial_version = config._initial_version() initial_version = config._initial_version()
result = runner.invoke(cli.cli, ['test', old_version, "--verbose", "--release", "beta"]) result = runner.invoke(cli.cli, ['test', old_version, "-vv", "--release", "beta"])
assert result.exit_code == 0 assert result.exit_code == 0
new_version = initial_version.replace(".0001-alpha", ".11000-beta") new_version = initial_version.replace(".0001-alpha", ".11000-beta")
assert f"Version: {new_version}\n" in result.output assert f"Version: {new_version}\n" in result.output
@ -144,7 +144,7 @@ def test_incr_to_final(runner):
old_version = "v201701.0999-alpha" old_version = "v201701.0999-alpha"
initial_version = config._initial_version() initial_version = config._initial_version()
result = runner.invoke(cli.cli, ['test', old_version, "--verbose", "--release", "final"]) result = runner.invoke(cli.cli, ['test', old_version, "-vv", "--release", "final"])
assert result.exit_code == 0 assert result.exit_code == 0
new_version = initial_version.replace(".0001-alpha", ".11000") new_version = initial_version.replace(".0001-alpha", ".11000")
assert f"Version: {new_version}\n" in result.output assert f"Version: {new_version}\n" in result.output
@ -153,7 +153,7 @@ def test_incr_to_final(runner):
def test_incr_invalid(runner): def test_incr_invalid(runner):
old_version = "v201701.0999-alpha" old_version = "v201701.0999-alpha"
result = runner.invoke(cli.cli, ['test', old_version, "--verbose", "--release", "alfa"]) result = runner.invoke(cli.cli, ['test', old_version, "-vv", "--release", "alfa"])
assert result.exit_code == 1 assert result.exit_code == 1
@ -182,7 +182,7 @@ def _add_project_files(*files):
def test_nocfg(runner, caplog): def test_nocfg(runner, caplog):
_add_project_files("README.md") _add_project_files("README.md")
result = runner.invoke(cli.cli, ['show', "--verbose"]) result = runner.invoke(cli.cli, ['show', "-vv"])
assert result.exit_code == 1 assert result.exit_code == 1
assert any( assert any(
bool("Could not parse configuration. Perhaps try 'pycalver init'." in r.message) bool("Could not parse configuration. Perhaps try 'pycalver init'." in r.message)
@ -193,7 +193,7 @@ def test_nocfg(runner, caplog):
def test_novcs_nocfg_init(runner, caplog, capsys): def test_novcs_nocfg_init(runner, caplog, capsys):
_add_project_files("README.md") _add_project_files("README.md")
# dry mode test # dry mode test
result = runner.invoke(cli.cli, ['init', "--verbose", "--dry"]) result = runner.invoke(cli.cli, ['init', "-vv", "--dry"])
assert result.exit_code == 0 assert result.exit_code == 0
assert not os.path.exists("pycalver.toml") assert not os.path.exists("pycalver.toml")
@ -209,7 +209,7 @@ def test_novcs_nocfg_init(runner, caplog, capsys):
# assert "Would have written to pycalver.toml:" in captured.out # assert "Would have written to pycalver.toml:" in captured.out
# non dry mode # non dry mode
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
# check logging # check logging
@ -226,12 +226,12 @@ def test_novcs_nocfg_init(runner, caplog, capsys):
assert base_str in cfg_content assert base_str in cfg_content
assert config.DEFAULT_TOML_README_MD_STR in cfg_content assert config.DEFAULT_TOML_README_MD_STR in cfg_content
result = runner.invoke(cli.cli, ['show', "--verbose"]) result = runner.invoke(cli.cli, ['show', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Current Version: {config._initial_version()}\n" in result.output assert f"Current Version: {config._initial_version()}\n" in result.output
assert f"PEP440 : {config._initial_version_pep440()}\n" in result.output assert f"PEP440 : {config._initial_version_pep440()}\n" in result.output
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 1 assert result.exit_code == 1
# check logging # check logging
@ -241,9 +241,9 @@ def test_novcs_nocfg_init(runner, caplog, capsys):
assert "Configuration already initialized" in log.message assert "Configuration already initialized" in log.message
def test_novcs_setupcfg_init(runner): def test_novcs_setupcfg_init(runner, caplog):
_add_project_files("README.md", "setup.cfg") _add_project_files("README.md", "setup.cfg")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
with pl.Path("setup.cfg").open(mode="r", encoding="utf-8") as fh: with pl.Path("setup.cfg").open(mode="r", encoding="utf-8") as fh:
@ -255,7 +255,7 @@ def test_novcs_setupcfg_init(runner):
assert base_str in cfg_content assert base_str in cfg_content
assert config.DEFAULT_CONFIGPARSER_README_MD_STR in cfg_content assert config.DEFAULT_CONFIGPARSER_README_MD_STR in cfg_content
result = runner.invoke(cli.cli, ['show', "--verbose"]) result = runner.invoke(cli.cli, ['show', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Current Version: {config._initial_version()}\n" in result.output assert f"Current Version: {config._initial_version()}\n" in result.output
assert f"PEP440 : {config._initial_version_pep440()}\n" in result.output assert f"PEP440 : {config._initial_version_pep440()}\n" in result.output
@ -263,7 +263,7 @@ def test_novcs_setupcfg_init(runner):
def test_novcs_pyproject_init(runner): def test_novcs_pyproject_init(runner):
_add_project_files("README.md", "pyproject.toml") _add_project_files("README.md", "pyproject.toml")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
with pl.Path("pyproject.toml").open(mode="r", encoding="utf-8") as fh: with pl.Path("pyproject.toml").open(mode="r", encoding="utf-8") as fh:
@ -293,7 +293,7 @@ def test_git_init(runner):
_add_project_files("README.md") _add_project_files("README.md")
_vcs_init("git") _vcs_init("git")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
result = runner.invoke(cli.cli, ['show']) result = runner.invoke(cli.cli, ['show'])
@ -306,7 +306,7 @@ def test_hg_init(runner):
_add_project_files("README.md") _add_project_files("README.md")
_vcs_init("hg") _vcs_init("hg")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
result = runner.invoke(cli.cli, ['show']) result = runner.invoke(cli.cli, ['show'])
@ -321,7 +321,7 @@ def test_git_tag_eval(runner):
# This will set a version that is older than the version tag # This will set a version that is older than the version tag
# we set in the vcs, which should take precedence. # we set in the vcs, which should take precedence.
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
initial_version = config._initial_version() initial_version = config._initial_version()
tag_version = initial_version.replace(".0001-alpha", ".0123-beta") tag_version = initial_version.replace(".0001-alpha", ".0123-beta")
@ -329,7 +329,7 @@ def test_git_tag_eval(runner):
sh("git", "tag", "--annotate", tag_version, "--message", f"bump version to {tag_version}") sh("git", "tag", "--annotate", tag_version, "--message", f"bump version to {tag_version}")
result = runner.invoke(cli.cli, ['show', "--verbose"]) result = runner.invoke(cli.cli, ['show', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Current Version: {tag_version}\n" in result.output assert f"Current Version: {tag_version}\n" in result.output
assert f"PEP440 : {tag_version_pep440}\n" in result.output assert f"PEP440 : {tag_version_pep440}\n" in result.output
@ -341,7 +341,7 @@ def test_hg_tag_eval(runner):
# This will set a version that is older than the version tag # This will set a version that is older than the version tag
# we set in the vcs, which should take precedence. # we set in the vcs, which should take precedence.
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
initial_version = config._initial_version() initial_version = config._initial_version()
tag_version = initial_version.replace(".0001-alpha", ".0123-beta") tag_version = initial_version.replace(".0001-alpha", ".0123-beta")
@ -349,7 +349,7 @@ def test_hg_tag_eval(runner):
sh("hg", "tag", tag_version, "--message", f"bump version to {tag_version}") sh("hg", "tag", tag_version, "--message", f"bump version to {tag_version}")
result = runner.invoke(cli.cli, ['show', "--verbose"]) result = runner.invoke(cli.cli, ['show', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
assert f"Current Version: {tag_version}\n" in result.output assert f"Current Version: {tag_version}\n" in result.output
assert f"PEP440 : {tag_version_pep440}\n" in result.output assert f"PEP440 : {tag_version_pep440}\n" in result.output
@ -358,10 +358,10 @@ def test_hg_tag_eval(runner):
def test_novcs_bump(runner): def test_novcs_bump(runner):
_add_project_files("README.md") _add_project_files("README.md")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
result = runner.invoke(cli.cli, ['bump', "--verbose"]) result = runner.invoke(cli.cli, ['bump', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
calver = config._initial_version()[:7] calver = config._initial_version()[:7]
@ -371,7 +371,7 @@ def test_novcs_bump(runner):
assert calver + ".0002-alpha !\n" in content assert calver + ".0002-alpha !\n" in content
assert calver[1:] + ".2a0 !\n" in content assert calver[1:] + ".2a0 !\n" in content
result = runner.invoke(cli.cli, ['bump', "--verbose", "--release", "beta"]) result = runner.invoke(cli.cli, ['bump', "-vv", "--release", "beta"])
assert result.exit_code == 0 assert result.exit_code == 0
with pl.Path("README.md").open() as fh: with pl.Path("README.md").open() as fh:
@ -384,13 +384,13 @@ def test_git_bump(runner):
_add_project_files("README.md") _add_project_files("README.md")
_vcs_init("git") _vcs_init("git")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
sh("git", "add", "pycalver.toml") sh("git", "add", "pycalver.toml")
sh("git", "commit", "-m", "initial commit") sh("git", "commit", "-m", "initial commit")
result = runner.invoke(cli.cli, ['bump', "--verbose"]) result = runner.invoke(cli.cli, ['bump', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
calver = config._initial_version()[:7] calver = config._initial_version()[:7]
@ -404,13 +404,13 @@ def test_hg_bump(runner):
_add_project_files("README.md") _add_project_files("README.md")
_vcs_init("hg") _vcs_init("hg")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
sh("hg", "add", "pycalver.toml") sh("hg", "add", "pycalver.toml")
sh("hg", "commit", "-m", "initial commit") sh("hg", "commit", "-m", "initial commit")
result = runner.invoke(cli.cli, ['bump', "--verbose"]) result = runner.invoke(cli.cli, ['bump', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
calver = config._initial_version()[:7] calver = config._initial_version()[:7]
@ -424,7 +424,7 @@ def test_empty_git_bump(runner, caplog):
sh("git", "init") sh("git", "init")
with pl.Path("setup.cfg").open(mode="w") as fh: with pl.Path("setup.cfg").open(mode="w") as fh:
fh.write("") fh.write("")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
with pl.Path("setup.cfg").open(mode="r") as fh: with pl.Path("setup.cfg").open(mode="r") as fh:
@ -445,7 +445,7 @@ def test_empty_hg_bump(runner, caplog):
sh("hg", "init") sh("hg", "init")
with pl.Path("setup.cfg").open(mode="w") as fh: with pl.Path("setup.cfg").open(mode="w") as fh:
fh.write("") fh.write("")
result = runner.invoke(cli.cli, ['init', "--verbose"]) result = runner.invoke(cli.cli, ['init', "-vv"])
assert result.exit_code == 0 assert result.exit_code == 0
with pl.Path("setup.cfg").open(mode="r") as fh: with pl.Path("setup.cfg").open(mode="r") as fh: