pytest: search for less escaped log messages

Author: endothermicdev

tests/test_cln_rs.py

@@ -65,10 +65,10 @@ def test_plugin_start(node_factory):
 
     l1.rpc.setconfig("test-dynamic-option", True)
     assert l1.rpc.listconfigs("test-dynamic-option")["configs"]["test-dynamic-option"]["value_bool"]
-    wait_for(lambda: l1.daemon.is_in_log(r'cln-plugin-startup: Got dynamic option change: test-dynamic-option \\"true\\"'))
+    wait_for(lambda: l1.daemon.is_in_log(r'cln-plugin-startup: Got dynamic option change: test-dynamic-option "true"'))
     l1.rpc.setconfig("test-dynamic-option", False)
     assert not l1.rpc.listconfigs("test-dynamic-option")["configs"]["test-dynamic-option"]["value_bool"]
-    wait_for(lambda: l1.daemon.is_in_log(r'cln-plugin-startup: Got dynamic option change: test-dynamic-option \\"false\\"'))
+    wait_for(lambda: l1.daemon.is_in_log(r'cln-plugin-startup: Got dynamic option change: test-dynamic-option "false"'))
 
 
 def test_plugin_options_handle_defaults(node_factory):

tests/test_pay.py

@@ -4808,7 +4808,7 @@ def test_dev_rawrequest(node_factory):
     # Get fetchinvoice to make us an invoice_request
     l1.rpc.call('fetchinvoice', {'offer': offer['bolt12']})
 
-    m = re.search(r'invoice_request: \\"([a-z0-9]*)\\"', l1.daemon.is_in_log('invoice_request:'))
+    m = re.search(r'invoice_request: "([a-z0-9]*)"', l1.daemon.is_in_log('invoice_request:'))
     ret = l1.rpc.call('dev-rawrequest', {'invreq': m.group(1),
                                          'nodeid': l2.info['id'],
                                          'timeout': 10})
@@ -5936,7 +5936,7 @@ def test_offer_experimental_fields(node_factory):
         l2.rpc.fetchinvoice(mangled)
 
     # invice request contains the unknown field
-    m = re.search(r'invoice_request: \\"([a-z0-9]*)\\"', l2.daemon.is_in_log('invoice_request:'))
+    m = re.search(r'invoice_request: "([a-z0-9]*)"', l2.daemon.is_in_log('invoice_request:'))
     assert l1.rpc.decode(m.group(1))['unknown_invoice_request_tlvs'] == [{'type': 1000000001, 'length': 1, 'value': '00'}]
 
 

tests/test_xpay.py

@@ -434,11 +434,11 @@ def test_xpay_takeover(node_factory, executor):
     # Other args fail.
     inv = l3.rpc.invoice('any', "test_xpay_takeover7", "test_xpay_takeover7")
     l1.rpc.pay(inv['bolt11'], amount_msat=10000, label='test_xpay_takeover7')
-    l1.daemon.wait_for_log(r'Not redirecting pay \(unknown arg \\"label\\"\)')
+    l1.daemon.wait_for_log(r'Not redirecting pay \(unknown arg "label"\)')
 
     inv = l3.rpc.invoice('any', "test_xpay_takeover8", "test_xpay_takeover8")
     l1.rpc.pay(inv['bolt11'], amount_msat=10000, riskfactor=1)
-    l1.daemon.wait_for_log(r'Not redirecting pay \(unknown arg \\"riskfactor\\"\)')
+    l1.daemon.wait_for_log(r'Not redirecting pay \(unknown arg "riskfactor"\)')
 
     # Test that it's really dynamic.
     l1.rpc.setconfig('xpay-handle-pay', False)