undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/test-terminal: avoid non-inclusive language

Browse Source 
In the ongoing effort to make the Git project a more inclusive place,
let's try to avoid names like "master" where possible.

In this instance, the use of the term `slave` is unfortunately enshrined
in IO::Pty's API. We simply cannot avoid using that word here. But at
least we can get rid of the usage of the word `master` and hope that
IO::Pty will be eventually adjusted, too.

Guessing that IO::Pty might follow Python's lead, we replace the name
`master` by `parent` (hoping that IO::Pty will adopt the parent/child
nomenclature, too).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2020-09-21 22:01:23 +00:00 committed by Junio C Hamano
parent 385c171a01
commit 659288cd91
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
t/test-terminal.perl
View File

@ -81,24 +81,24 @@ if ($#ARGV < 1) {
die "usage: test-terminal program args"; die "usage: test-terminal program args";
} }
$ENV{TERM} = 'vt100'; $ENV{TERM} = 'vt100';
my $master_in = new IO::Pty; my $parent_in = new IO::Pty;
my $master_out = new IO::Pty; my $parent_out = new IO::Pty;
my $master_err = new IO::Pty; my $parent_err = new IO::Pty;
$master_in->set_raw(); $parent_in->set_raw();
$master_out->set_raw(); $parent_out->set_raw();
$master_err->set_raw(); $parent_err->set_raw();
$master_in->slave->set_raw(); $parent_in->slave->set_raw();
$master_out->slave->set_raw(); $parent_out->slave->set_raw();
$master_err->slave->set_raw(); $parent_err->slave->set_raw();
my $pid = start_child(\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave); my $pid = start_child(\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave);
close $master_in->slave; close $parent_in->slave;
close $master_out->slave; close $parent_out->slave;
close $master_err->slave; close $parent_err->slave;
my $in_pid = copy_stdin($master_in); my $in_pid = copy_stdin($parent_in);
copy_stdio($master_out, $master_err); copy_stdio($parent_out, $parent_err);
my $ret = finish_child($pid); my $ret = finish_child($pid);
# If the child process terminates before our copy_stdin() process is able to # If the child process terminates before our copy_stdin() process is able to
# write all of its data to $master_in, the copy_stdin() process could stall. # write all of its data to $parent_in, the copy_stdin() process could stall.
# Send SIGTERM to it to ensure it terminates. # Send SIGTERM to it to ensure it terminates.
kill 'TERM', $in_pid; kill 'TERM', $in_pid;
finish_child($in_pid); finish_child($in_pid);