Fix two failing tests after ATF update
ClosedPublic
Actions

Authored by arichardson on Feb 15 2021, 10:36 AM.

Details

Reviewers

cem
kevans
lwhsu
ngie

Commits

rGd97a4cb221d5: Fix two failing tests after ATF update
rG10fc4c321838: Fix two failing tests after ATF update

Summary

Since https://github.com/freebsd/atf/commit/4581cefc1e3811dd3c926b5dd4b15fd63d2e19da
ATF opens the results file on startup. This fixes problems like
capsicumized tests not being able to open the file on exit.

However, this test closes all file descriptors just to check that
socketpair returns fd 3+4 and thereby also closes the ATF results file.
This then results in an EBADF when writing the result so the test is
reported as broken.

While system calls that create new file descriptors (must?) use the lowest
available file descriptor number, it does not seem useful to test this
property here. Drop the check for FD==3/4 to unbreak the testsuite.

We could also try to re-open the results file in ATF if we get a EBADF
error, but that will fail when running under Capsicum.

Test Plan

tests pass now.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

arichardson created this revision.Feb 15 2021, 10:36 AM

Herald added a subscriber: imp. · View Herald TranscriptFeb 15 2021, 10:36 AM

arichardson requested review of this revision.Feb 15 2021, 10:36 AM

Harbormaster completed remote builds in B37014: Diff 83920.Feb 15 2021, 10:36 AM

Note: this also affects contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c:t_spawn_fileactions, but I haven't tried fixing that one yet.

The analysis makes sense and the fix looks fine to me. You could allocate two fds and check socketpair against both (instead of just low) in the final test, but I don't think there's much marginal value in that. (Frankly, I'm not a fan of unix' must-assign-lowest-fd behavior in general, but we have to abide by it.)

This revision is now accepted and ready to land.Feb 15 2021, 6:54 PM

Closed by commit rG10fc4c321838: Fix two failing tests after ATF update (authored by arichardson). · Explain WhyFeb 15 2021, 10:57 PM

This revision was automatically updated to reflect the committed changes.

arichardson added a commit: rG10fc4c321838: Fix two failing tests after ATF update.

arichardson added a commit: rGd97a4cb221d5: Fix two failing tests after ATF update.Mar 17 2021, 2:05 PM