Skip to content

Only add tab if title and window_id are present, as a workaround for … #40

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

Draft
diegov wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Only add tab if title and window_id are present, as a workaround for … #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f148f11
Only add tab if title and window_id are present, as a workaround for …
diegov Apr 26, 2024
48470f9
Ensure results file is written when invocation returns error code
diegov Jun 2, 2024
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
8 changes: 7 additions & 1 deletion host/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,13 @@ fn main() -> io::Result<()> {
attributes.merge(&existing.1);
*existing = (curr_time, attributes);
} else {
data.insert(event.tab_info.tab_id, (curr_time, attributes));
// We some times receive events with null titles and window ids, for which
// we never receive remove events afterwards. Not sure what those are,
// they might be the result of a race condition on the extension side, but
// as a workaround we ignore them here.
if attributes.title.is_some() && attributes.window_id.is_some() {
data.insert(event.tab_info.tab_id, (curr_time, attributes));
}
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions integration_tests/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,33 @@ function run-suite() {
local invocation=( dbus-launch "$VIRTUALENV_DIR"/bin/python3 tabreport_tests.py "$ff_version" "$xpi_file" )
tmpfile=
if [ "$REPORT_MD_FILE" != "" ]; then
echo "Outputting to ${REPORT_MD_FILE}" >&2
tmpfile="$(mktemp)"
invocation=( "${invocation[@]}" -o "$tmpfile" )
fi

result=0
if [ "$host_target_version" != "" ]; then
echo "Running integration tests with Firefox $ff_version and native host version ${host_target_version}" >&2
echo "" >&2
set +e
HOST_TARGET_VERSION="$host_target_version" "${invocation[@]}"
result=$?
set -e
else
echo "Running integration tests with Firefox $ff_version" >&2
echo "" >&2
set +e
"${invocation[@]}"
result=$?
set -e
fi

if [ "$REPORT_MD_FILE" != "" ]; then
cat "$tmpfile" >> "$REPORT_MD_FILE"
fi

return "$result"
}

while read -r ff_version; do
Expand Down