diff mbox

[2/3] Fix Python help() test for Python 3

Message ID 54789B4D.2090204@ericsson.com
State Committed
Headers

Commit Message

Simon Marchi Nov. 28, 2014, 3:57 p.m. UTC 
  > I am OK with the patch as is, and verified with Python 2.3, 2.6,
> 2.7 and 3.4 that "Welcome to Python" is part of the output of
> the help() function. But since the purpose of the test is purely
> to verify that the help() function does not hang, just verifying
> that we have the prompt should achieve that goal, so I don't see
> a need to extend the the expected output to match the "Welcome [...]"
> message as well. I would personally just drop the "online" from
> the expected output. Just my 2 cents, either way is fine.
> 
> Thank you!

Sure, it's really not a life or death issue. Let's go with this then?

From 5deccafc1d5713d77fbc78c65711d6f6a6f87892 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue, 25 Nov 2014 22:56:12 -0500
Subject: [PATCH] Fix Python help() test for Python 3

The message displayed when using help() changed a bit with time, so this
adjusts the test accordingly.

gdb/testsuite/ChangeLog:

	* gdb.python/python.exp: Change expected reply to help().
---
 gdb/testsuite/gdb.python/python.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Joel Brobecker Nov. 29, 2014, 11:42 a.m. UTC | #1 
> Sure, it's really not a life or death issue. Let's go with this then?
> 
> >From 5deccafc1d5713d77fbc78c65711d6f6a6f87892 Mon Sep 17 00:00:00 2001
> From: Simon Marchi <simon.marchi@ericsson.com>
> Date: Tue, 25 Nov 2014 22:56:12 -0500
> Subject: [PATCH] Fix Python help() test for Python 3
> 
> The message displayed when using help() changed a bit with time, so this
> adjusts the test accordingly.
> 
> gdb/testsuite/ChangeLog:
> 
> 	* gdb.python/python.exp: Change expected reply to help().

Great! This is OK.

Thank you,
Simon Marchi Dec. 1, 2014, 1:08 p.m. UTC | #2 
On 2014-11-29 06:42 AM, Joel Brobecker wrote:
>> Sure, it's really not a life or death issue. Let's go with this then?
>>
>> >From 5deccafc1d5713d77fbc78c65711d6f6a6f87892 Mon Sep 17 00:00:00 2001
>> From: Simon Marchi <simon.marchi@ericsson.com>
>> Date: Tue, 25 Nov 2014 22:56:12 -0500
>> Subject: [PATCH] Fix Python help() test for Python 3
>>
>> The message displayed when using help() changed a bit with time, so this
>> adjusts the test accordingly.
>>
>> gdb/testsuite/ChangeLog:
>>
>> 	* gdb.python/python.exp: Change expected reply to help().
> 
> Great! This is OK.
> 
> Thank you,

Pushed!
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 787a294..dcbc35c 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -67,7 +67,7 @@  gdb_py_test_multiple "multi-line python command" \
 with_test_prefix "python interactive help" {
     set test "python; help(); end"
     gdb_test_multiple "python\nhelp()\nend" $test {
-	-re "online help utility.*help> $" {
+	-re ".*help utility.*help> $" {
 	    pass $test

 	    # The "quit" must be seen on the output.  A buggy GDB