test: Make ua_comment test pass on 0.16.0 #12302

laanwj · 2018-01-30T17:58:36Z

The specific length of the uacomment is one shorter on 0.16.0 than on 0.15.99 causing the (stupid) test to fail.

This change makes assert_start_raises_init_error optionally take a regexp, so that the error message can be checked without being specific about the reported length.

theuni · 2018-01-30T18:01:00Z

utACK 0224be7bb45f0faed13ba067d14082f19cc0685a

promag

utACK.

promag · 2018-01-30T18:08:19Z

test/functional/feature_uacomment.py

@@ -23,8 +23,8 @@ def run_test(self):

        self.log.info("test -uacomment max length")
        self.stop_node(0)
-        expected = "Total length of network version string (286) exceeds maximum length (256). Reduce the number or size of uacomments."
-        self.assert_start_raises_init_error(0, ["-uacomment=" + 'a' * 256], expected)
+        expected = r"Total length of network version string \([0-9]+\) exceeds maximum length \(256\). Reduce the number or size of uacomments."


promag · 2018-01-30T18:12:19Z

test/functional/test_framework/test_framework.py

@@ -283,7 +284,11 @@ def assert_start_raises_init_error(self, i, extra_args=None, expected_msg=None,
                if expected_msg is not None:
                    log_stderr.seek(0)
                    stderr = log_stderr.read().decode('utf-8')
-                    if expected_msg not in stderr:
+                    if use_re:
+                        match = re.search(expected_msg, stderr)


nit nit, always treat as regexp and remove option?

no, then I'd have to change all the tests

jnewbery · 2018-01-30T18:37:40Z

Why not just the minimal fix of:

--- a/test/functional/feature_uacomment.py
+++ b/test/functional/feature_uacomment.py
@@ -23,7 +23,7 @@ class UacommentTest(BitcoinTestFramework):
 
         self.log.info("test -uacomment max length")
         self.stop_node(0)
-        expected = "Total length of network version string (286) exceeds maximum length (256). Reduce the number or size of uacomments."
+        expected = "exceeds maximum length (256). Reduce the number or size of uacomments."
         self.assert_start_raises_init_error(0, ["-uacomment=" + 'a' * 256], expected)

Rather than changing the assert_start_raises_init_error() util function for this one case.

laanwj · 2018-01-30T18:38:26Z

Sigh...

laanwj · 2018-01-30T18:38:50Z

Closing this, feel free to fix it in your own way.

sdaftuar · 2018-01-30T18:45:09Z

ACK 0224be7bb45f0faed13ba067d14082f19cc0685a (verified that it fixes 0.16.0)
utACK 031c9a0

Let's just merge a fix and move on, this is too much bikeshedding imo.

The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. Just match the latter part of the message only.

jnewbery · 2018-01-30T20:50:07Z

ACK aac6bce

I agree with the longer term goal of changing assert_start_raises_init_error() to compare regexs. There are lots of other tests that check substrings which could be improved.

maflcko · 2018-01-30T20:53:32Z

utACK aac6bce

Didn't test that this fixes 0.16. Going to merge and cross fingers...

aac6bce test: Make ua_comment test pass on 0.16.0 (Wladimir J. van der Laan) Pull request description: The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. This change makes `assert_start_raises_init_error` optionally take a regexp, so that the error message can be checked without being specific about the reported length. Tree-SHA512: 1c5e9f1d0b36f004f8113c7e211e8281194ce8057869ac3702172d8b021df3c3aa3b8f79b9434678ed0fb7146f848802410647d434fc884aa200b6a5e26afe8b

jnewbery · 2018-01-30T20:59:34Z

(also tested it fixes v0.16 for me)

The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. Just match the latter part of the message only. Github-Pull: bitcoin#12302 Rebased-From: aac6bce

The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. Just match the latter part of the message only. Github-Pull: #12302 Rebased-From: aac6bce Tree-SHA512: 9edecbe2529584d6d01296ec153330bb44add8445fef139d7b7a667b86fef8ee3aafea55d95ac109c9fef079133709f69798477e3eba92744ea2f6c8f5acbb7d

The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. Just match the latter part of the message only. Github-Pull: bitcoin#12302 Rebased-From: aac6bce Tree-SHA512: 9edecbe2529584d6d01296ec153330bb44add8445fef139d7b7a667b86fef8ee3aafea55d95ac109c9fef079133709f69798477e3eba92744ea2f6c8f5acbb7d

aac6bce test: Make ua_comment test pass on 0.16.0 (Wladimir J. van der Laan) Pull request description: The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. This change makes `assert_start_raises_init_error` optionally take a regexp, so that the error message can be checked without being specific about the reported length. Tree-SHA512: 1c5e9f1d0b36f004f8113c7e211e8281194ce8057869ac3702172d8b021df3c3aa3b8f79b9434678ed0fb7146f848802410647d434fc884aa200b6a5e26afe8b

laanwj added the Tests label Jan 30, 2018

laanwj added this to the 0.16.0 milestone Jan 30, 2018

promag reviewed Jan 30, 2018

View reviewed changes

laanwj force-pushed the 2017_01_uacomment_test_fix branch from 0224be7 to 031c9a0 Compare January 30, 2018 18:28

laanwj closed this Jan 30, 2018

laanwj reopened this Jan 30, 2018

laanwj force-pushed the 2017_01_uacomment_test_fix branch from 031c9a0 to 197982b Compare January 30, 2018 20:19

test: Make ua_comment test pass on 0.16.0

aac6bce

The specific length of the uacomment is one shorter on `0.16.0` than on `0.15.99` causing the (stupid) test to fail. Just match the latter part of the message only.

laanwj force-pushed the 2017_01_uacomment_test_fix branch from 197982b to aac6bce Compare January 30, 2018 20:20

maflcko merged commit aac6bce into bitcoin:master Jan 30, 2018

bitcoin deleted a comment Jan 30, 2018

jnewbery mentioned this pull request Jan 30, 2018

[qa] 0.16: Backport 12302 #12304

Closed

jnewbery mentioned this pull request Feb 7, 2018

[WIP] Better stderr testing in functional tests #12379

Closed

laanwj mentioned this pull request Mar 19, 2018

[Tests] Require exact match in assert_start_raises_init_eror (jnewbery) #12718

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

test: Make ua_comment test pass on 0.16.0 #12302

test: Make ua_comment test pass on 0.16.0 #12302

Uh oh!

laanwj commented Jan 30, 2018

Uh oh!

theuni commented Jan 30, 2018

Uh oh!

promag left a comment

Uh oh!

promag Jan 30, 2018

Uh oh!

promag Jan 30, 2018

Uh oh!

laanwj Jan 30, 2018

Uh oh!

jnewbery commented Jan 30, 2018 •

edited

Loading

Uh oh!

laanwj commented Jan 30, 2018

Uh oh!

laanwj commented Jan 30, 2018

Uh oh!

sdaftuar commented Jan 30, 2018

Uh oh!

jnewbery commented Jan 30, 2018

Uh oh!

maflcko commented Jan 30, 2018

Uh oh!

jnewbery commented Jan 30, 2018

Uh oh!

Uh oh!

test: Make ua_comment test pass on 0.16.0 #12302

test: Make ua_comment test pass on 0.16.0 #12302

Uh oh!

Conversation

laanwj commented Jan 30, 2018

Uh oh!

theuni commented Jan 30, 2018

Uh oh!

promag left a comment

Choose a reason for hiding this comment

Uh oh!

promag Jan 30, 2018

Choose a reason for hiding this comment

Uh oh!

promag Jan 30, 2018

Choose a reason for hiding this comment

Uh oh!

laanwj Jan 30, 2018

Choose a reason for hiding this comment

Uh oh!

jnewbery commented Jan 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

laanwj commented Jan 30, 2018

Uh oh!

laanwj commented Jan 30, 2018

Uh oh!

sdaftuar commented Jan 30, 2018

Uh oh!

jnewbery commented Jan 30, 2018

Uh oh!

maflcko commented Jan 30, 2018

Uh oh!

jnewbery commented Jan 30, 2018

Uh oh!

Uh oh!

jnewbery commented Jan 30, 2018 •

edited

Loading