diff --git a/pulp-glue-deb/pyproject.toml b/pulp-glue-deb/pyproject.toml index 43d0a59..d4c70bc 100644 --- a/pulp-glue-deb/pyproject.toml +++ b/pulp-glue-deb/pyproject.toml @@ -23,7 +23,7 @@ classifiers = [ "Typing :: Typed", ] dependencies = [ - "pulp-glue>=0.23.2,<0.33", + "pulp-glue>=0.23.2,<0.34", ] [project.urls] diff --git a/pyproject.toml b/pyproject.toml index 5c8a25d..3a4139e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ classifiers=[ "Typing :: Typed", ] dependencies = [ - "pulp-cli>=0.23.2,<0.33", + "pulp-cli>=0.23.2,<0.34", "pulp-glue-deb==0.3.0.dev", ] diff --git a/tests/scripts/config.source b/tests/scripts/config.source index a868ffe..2758992 100644 --- a/tests/scripts/config.source +++ b/tests/scripts/config.source @@ -52,7 +52,7 @@ expect_fail () { # Reports verbosely on failure assert () { if { - test "$@" + [[ "$@" ]] } 1>log.out 2>log.err then echo "SUCCESS [$@]" >&3 diff --git a/tests/scripts/pulp_deb/test_deb_remote.sh b/tests/scripts/pulp_deb/test_deb_remote.sh index 91ec908..2645a47 100755 --- a/tests/scripts/pulp_deb/test_deb_remote.sh +++ b/tests/scripts/pulp_deb/test_deb_remote.sh @@ -44,7 +44,7 @@ expect_succ pulp deb remote update --name "${ENTITIES_NAME}" --distribution "bar expect_succ pulp deb remote show --name "${ENTITIES_NAME}" assert "$(echo "$OUTPUT" | jq -r .distributions)" == "bar" expect_fail pulp deb remote update --name "${ENTITIES_NAME}" --distribution "" -assert "${ERROUTPUT}" == 'Error: Must have at least one distribution for remote.' +assert "${ERROUTPUT}" =~ 'Error: Must have at least one distribution for remote.' # Try some possible modifications of the remote's components: expect_succ pulp deb remote update --name "${ENTITIES_NAME}" --component "bar" diff --git a/tests/test_help_pages.py b/tests/test_help_pages.py index ad2964b..855c1f1 100644 --- a/tests/test_help_pages.py +++ b/tests/test_help_pages.py @@ -51,7 +51,10 @@ def test_access_help(no_api: None, subtests: SubTests) -> None: result = runner.invoke(main, args + ["--help"], catch_exceptions=False) if result.exit_code == 2: - assert "not available in this context" in result.stdout + assert ( + "not available in this context" in result.stdout + or "not available in this context" in result.stderr + ) else: assert result.exit_code == 0 assert result.stdout.startswith("Usage:") or result.stdout.startswith(