Skip to content

DLPX-87531 Fix SDB test regression due to drgn API change #339

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

Merged
merged 1 commit into from
Aug 22, 2023
Merged

DLPX-87531 Fix SDB test regression due to drgn API change #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/integration/data/regression_output/dump.201912060006/core/ptype thread_union
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
union thread_union {
struct task_struct task;
unsigned long stack[2048];
}
@#$ EXIT CODE $#@
0
7 changes: 0 additions & 7 deletions ...re/ptype zfs_case 'struct v' thread_union → ...put/dump.201912060006/core/ptype zfs_case
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,5 @@ enum zfs_case {
ZFS_CASE_INSENSITIVE = 1,
ZFS_CASE_MIXED = 2,
}
struct v {
uint8_t b[16];
}
union thread_union {
struct task_struct task;
unsigned long stack[2048];
}
@#$ EXIT CODE $#@
0
6 changes: 6 additions & 0 deletions tests/integration/data/regression_output/dump.202303131823/core/ptype thread_union
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
union thread_union {
struct task_struct task;
unsigned long stack[2048];
}
@#$ EXIT CODE $#@
0
7 changes: 0 additions & 7 deletions ...re/ptype zfs_case 'struct v' thread_union → ...put/dump.202303131823/core/ptype zfs_case
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,5 @@ enum zfs_case {
ZFS_CASE_INSENSITIVE = 1,
ZFS_CASE_MIXED = 2,
}
struct v {
uint8_t b[32];
}
union thread_union {
struct task_struct task;
unsigned long stack[2048];
}
@#$ EXIT CODE $#@
0
8 changes: 8 additions & 0 deletions tests/integration/infra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,14 @@ def verify_cmd_output_and_code(self,
assert self.repl_invoke(cmd) == ref_code
captured = capsys.readouterr()
if not stripped:
with capsys.disabled():
if captured.out != ref_output:
#
# If we are about to fail the assertion print the
# actual mismatch in the logs before failing.
#
print("expected:\n" + ref_output)
print("got:\n" + captured.out)
assert captured.out == ref_output
else:
for i, n in enumerate(captured.out):
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/test_core_generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@
# ptype
"ptype spa_t",
"ptype spa vdev",
"ptype zfs_case 'struct v' thread_union",
"ptype zfs_case",
"ptype thread_union",
"ptype 'struct spa'",

# sizeof
Expand Down