Opened 14 months ago

Closed 5 months ago

#19699 closed defect (fixed)

Remove almost all functionality from Tor's test-network.sh

Reported by: teor Owned by:
Priority: Medium Milestone: Tor: 0.3.0.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: 029-proposed, tor-03-unspecified-201612
Cc: Actual Points:
Parent ID: Points: 0.3
Reviewer: Sponsor: SponsorS-can

Description

All that we'll need is a stub that exists to locate chutney's test-network.sh.

The parts of the script that need to be deleted will be clearly marked as part of #19698.

Child Tickets

TicketStatusOwnerSummaryComponent
#19698closedCall chutney's test-network.sh from Tor's test-network.shCore Tor/Tor

Change History (10)

comment:1 Changed 14 months ago by teor

Parent ID: #19116

The chutney feature has been merged to master.

comment:2 Changed 13 months ago by teor

We could do this in 0.3.0 if we want. It is in no way urgent, the latest tor test-network.sh calls chutney/tools/test-network.sh if present, with its original argument list.

comment:3 Changed 10 months ago by teor

Milestone: Tor: 0.2.???Tor: 0.3.???

Milestone renamed

comment:4 Changed 9 months ago by nickm

Keywords: tor-03-unspecified-201612 added
Milestone: Tor: 0.3.???Tor: unspecified

Finally admitting that 0.3.??? was a euphemism for Tor: unspecified all along.

comment:5 Changed 7 months ago by teor

Because we didn't do this, we failed to discover #21562.
But that's not going to happen again once it's fixed.

comment:6 Changed 7 months ago by teor

Milestone: Tor: unspecifiedTor: 0.3.0.x-final
Version: Tor: unspecified

ln5 tells me that BSD doesn't have bash by default.
So I think we need to do this in 030.

comment:7 Changed 7 months ago by teor

Milestone: Tor: 0.3.0.x-finalTor: 0.3.1.x-final
Version: Tor: unspecified

When this is implemented, we can also restore these lines from Makefile.am that were removed in #21581:

        if test $$? -eq 2 ; then \
            echo "Please update your chutney using 'git pull' to see tor warnin\
gs here."; \
        fi; \

But this could be really annoying if we get it wrong, so it might just be better to leave them out.

comment:8 Changed 7 months ago by teor

Points: 0.10.3
Status: newneeds_review

Please see my branch bug19699.

If CHUTNEY_PATH is set, and chutney's tools/test-network.sh exists, tor's src/test/test-network.sh calls it using "$@" to preserve arguments with spaces.

Otherwise, tor's src/test/test-network.sh parses the arguments, and calls chutney's tools/test-network.sh using the resulting CHUTNEY_PATH. (Parsing the arguments breaks any arguments that contain spaces, because it's not possible to save shell arguments in a portable way.)

I don't think we'll restore the "upgrade chutney" reminder. It's annoying.

comment:9 Changed 7 months ago by nickm

Milestone: Tor: 0.3.1.x-finalTor: 0.3.0.x-final

lgtm; merged to master and marking for possible 030 backport.

comment:10 Changed 5 months ago by teor

Resolution: fixed
Status: needs_reviewclosed

We're not going to backport this to 0.3.0 at this stage.

Note: See TracTickets for help on using tickets.