Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZTS: Avoid unset $tmpdir in redacted_panic #12455

Merged
merged 1 commit into from
Aug 16, 2021
Merged

ZTS: Avoid unset $tmpdir in redacted_panic #12455

merged 1 commit into from
Aug 16, 2021

Conversation

ghost
Copy link

@ghost ghost commented Aug 4, 2021 •
edited by ghost
Loading

Motivation and Context

The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Description

Use $TEST_BASE_DIR instead of $tmpdir.

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@ghost ghost added Component: Test Suite Indicates an issue with the test framework or a test case Status: Code Review Needed Ready for review and testing labels Aug 4, 2021
@ghost ghost requested a review from jwk404 August 4, 2021 14:41
@ghost
Copy link
Author

ghost commented Aug 4, 2021 

warning: cannot send 'testpool/panic@init': signal received
ERROR: eval zfs send --redact testpool/panic#book_init testpool/panic@init >/testpool/tmp/stream.pcYl exited 1

Well, that's not great.

@ghost
Copy link
Author

ghost commented Aug 4, 2021

Perhaps $TEST_BASE_DIR is a better choice for $tmpdir in this particular case.

@ghost ghost force-pushed the zts-tmpdir branch 2 times, most recently from 9049bd1 to 34da1a3 Compare August 5, 2021 13:33
@ghost ghost changed the title ZTS: Set $tmpdir before use in redacted_panic test ZTS: Avoid unset $tmpdir in redacted_panic Aug 5, 2021
@ghost
Copy link
Author

ghost commented Aug 5, 2021

  • Use $TEST_BASE_DIR instead of $tmpdir

behlendorf
behlendorf reviewed Aug 13, 2021
View reviewed changes
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix looks good, but it looks like we're also failing to remove the stream file after the test runs and that would be good to also address.

ZTS: Avoid unset $tmpdir in redacted_panic
122caec 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
@ghost ghost force-pushed the zts-tmpdir branch from 34da1a3 to 122caec Compare August 16, 2021 13:48
@ghost
Copy link
Author

ghost commented Aug 16, 2021

  • Rebase
  • Clean up stream file after test

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Aug 16, 2021
@jwk404 jwk404 self-assigned this Aug 16, 2021
@behlendorf behlendorf merged commit 5bfc3a9 into openzfs:master Aug 16, 2021
@ghost ghost deleted the zts-tmpdir branch August 17, 2021 13:47
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 23, 2021
@behlendorf
ZTS: Avoid unset $tmpdir in redacted_panic
71c4c68 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#12455
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 24, 2021
@behlendorf
ZTS: Avoid unset $tmpdir in redacted_panic
ba39602 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#12455
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 24, 2021
ZTS: Avoid unset $tmpdir in redacted_panic
939c8a8 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#12455
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Aug 24, 2021
@behlendorf
ZTS: Avoid unset $tmpdir in redacted_panic
7ea620c 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#12455
behlendorf pushed a commit that referenced this pull request Aug 31, 2021
@behlendorf
ZTS: Avoid unset $tmpdir in redacted_panic
bed2062 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #12455
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 15, 2021
@tonyhutter
ZTS: Avoid unset $tmpdir in redacted_panic
c6c0d30 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#12455
rincebrain pushed a commit to rincebrain/zfs that referenced this pull request Sep 22, 2021
@rincebrain
ZTS: Avoid unset $tmpdir in redacted_panic
02e6727 
The redacted_send tests make use of a $tmpdir variable, except in
redacted_send/redacted_panic the variable is never defined.

Use $TEST_BASE_DIR instead.

Clean up the stream file after the test.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#12455
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jwk404 jwk404

Labels
Component: Test Suite Indicates an issue with the test framework or a test case Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@behlendorf @jwk404