Opened 8 weeks ago

Closed 2 weeks ago

#31837 closed defect (fixed)

Make test_rebind.py more robust

Reported by: teor Owned by: teor
Priority: Medium Milestone: Tor: 0.3.5.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: consider-backport-after-0423, 035-backport, 040-backport, 041-backport, BugSmashFund 042-can, asn-merge
Cc: Actual Points: 0.1
Parent ID: Points: 0.1
Reviewer: dgoulet Sponsor:

Description

  • actually sleep when waiting for tor to log
  • log at debug level when waiting for tor to log
  • backslash-replace bad UTF-8 characters in logs
  • format control commands as ASCII, tor does not accept UTF-8 control commands

Found during #30901.

Child Tickets

Change History (9)

comment:1 Changed 8 weeks ago by teor

Keywords: consider-backport-after-0423 added
Status: assignedneeds_review

See my pull request:

The merge forward is all clean.

comment:2 Changed 8 weeks ago by nickm

Keywords: 042-can added

comment:3 Changed 7 weeks ago by asn

Reviewer: dgoulet

comment:4 Changed 6 weeks ago by dgoulet

Keywords: asn-merge added
Status: needs_reviewmerge_ready

lgtm

comment:5 Changed 6 weeks ago by nickm

Status: merge_readyneeds_revision

This line looks wrong:

+            logging.debug('Tor has not logged anything, waiting for "{}"'.format(l.strip(), s))

You're calling format with two arguments, but the format string only has one {} entry.

comment:6 Changed 5 weeks ago by teor

You're right, l is the empty string here, so it does not need to be printed,

comment:7 in reply to:  1 Changed 4 weeks ago by teor

Status: needs_revisionmerge_ready

Replying to teor:

See my pull request:

The merge forward is all clean.

I deleted l.strip(), , amended the commit, and force-pushed.

Anyone can merge this branch to master after CI passes.

Since it's a CI stability fix, it should get some testing in master, so I will backport after 0.4.2.3.

comment:8 Changed 4 weeks ago by teor

Milestone: Tor: 0.4.2.x-finalTor: 0.4.1.x-final

Merged to 0.4.2 and later: obviously correct fixes to already reviewed code.

comment:9 Changed 2 weeks ago by teor

Milestone: Tor: 0.4.1.x-finalTor: 0.3.5.x-final
Resolution: fixed
Status: merge_readyclosed

Merged to 0.3.5 and later.
Merged #31107, #31466, #30916, #31408, #31837, and #31897 together.

Note: See TracTickets for help on using tickets.