From d607791a41d88a697b44d3485342b07b94b453f9fcfd0eec1ee2e053c434e49d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 12 Aug 2023 13:56:03 +0000 Subject: [PATCH] Accepting request 1103329 from home:buschmann23:branches:devel:languages:python - Fix failing test when no alias in bash is defined * add fix-fail-no-alias.patch OBS-URL: https://build.opensuse.org/request/show/1103329 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pexpect?expand=0&rev=74 --- fix-fail-no-alias.patch | 36 ++++++++++++++++++++++++++++++++++++ python-pexpect.changes | 6 ++++++ python-pexpect.spec | 1 + 3 files changed, 43 insertions(+) create mode 100644 fix-fail-no-alias.patch diff --git a/fix-fail-no-alias.patch b/fix-fail-no-alias.patch new file mode 100644 index 0000000..66d38aa --- /dev/null +++ b/fix-fail-no-alias.patch @@ -0,0 +1,36 @@ +From 000a8684bd109c3f9c9b5fabd95add4743b7f45a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20E=C3=9Fer?= +Date: Wed, 22 Sep 2021 17:48:07 +0200 +Subject: [PATCH] Do not fail if no alias has been defined +Upstream: merged (https://github.com/pexpect/pexpect/pull/698/commits/000a8684bd109c3f9c9b5fabd95add4743b7f45a) + +There is no output if no alias has been defined and the test fails in +that case. Adding an alias definition makes the alias command return +at least that just added entry. +--- + tests/test_replwrap.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/test_replwrap.py b/tests/test_replwrap.py +index 5e50ea28..73c82e84 100644 +--- a/tests/test_replwrap.py ++++ b/tests/test_replwrap.py +@@ -25,7 +25,7 @@ def tearDown(self): + + def test_bash(self): + bash = replwrap.bash() +- res = bash.run_command("alias") ++ res = bash.run_command("alias xyzzy=true; alias") + assert 'alias' in res, res + + try: +@@ -92,7 +92,9 @@ def test_existing_spawn(self): + "PS1='{0}' PS2='{1}' " + "PROMPT_COMMAND=''") + ++ print(repl) + res = repl.run_command("echo $HOME") ++ print(res) + assert res.startswith('/'), res + + def test_python(self): diff --git a/python-pexpect.changes b/python-pexpect.changes index 0d9bb3b..e853722 100644 --- a/python-pexpect.changes +++ b/python-pexpect.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 10 12:27:03 UTC 2023 - Matthias Fehring + +- Fix failing test when no alias in bash is defined + * add fix-fail-no-alias.patch + ------------------------------------------------------------------- Mon Jul 31 07:03:10 UTC 2023 - Matej Cepl diff --git a/python-pexpect.spec b/python-pexpect.spec index 6068f5a..2836014 100644 --- a/python-pexpect.spec +++ b/python-pexpect.spec @@ -28,6 +28,7 @@ Patch0: no-python-binary.patch # Newer asyncio / python 3.11 support Patch1: https://github.com/pexpect/pexpect/pull/715.patch Patch2: https://github.com/pexpect/pexpect/pull/684.patch +Patch3: fix-fail-no-alias.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module ptyprocess} BuildRequires: %{python_module pytest}