Commit 56a11b3e authored by intrigeri's avatar intrigeri

On MAC spoofing failure, include the name of the disabled network card in the...

On MAC spoofing failure, include the name of the disabled network card in the title of the notification

That was the intention since 988b4186
but in that commit, we forgot to replace gettext with eval_gettext
when introducing variables in the translatable string. Let's fix this
and accordingly, drop the test suite workaround for this bug.

refs: #17784
parent c44e9df1
......@@ -49,7 +49,7 @@ notify_panic_success() {
local nic_name
nic="${1}"
nic_name="${2}"
show_notification "`gettext \"Network card \\\${nic} disabled\"`" \
show_notification "`eval_gettext \"Network card \\\${nic} disabled\"`" \
"`eval_gettext \"MAC spoofing failed for network card \\\${nic_name} (\\\${nic}) so it is temporarily disabled.
You might prefer to restart Tails and disable MAC spoofing.\"`"
}
......
......@@ -40,8 +40,7 @@ Feature: Spoofing MAC addresses
When I log in to a new session
Then no network interfaces are enabled
And no network device leaked the real MAC address
# XXX: workaround for #17784
And I see the "Network card disabled" notification after at most 60 seconds
And I see the "Network card eth0 disabled" notification after at most 60 seconds
Scenario: MAC address spoofing fails and macchanger returns true
Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
......@@ -51,8 +50,7 @@ Feature: Spoofing MAC addresses
When I log in to a new session
Then no network interfaces are enabled
And no network device leaked the real MAC address
# XXX: workaround for #17784
And I see the "Network card disabled" notification after at most 60 seconds
And I see the "Network card eth0 disabled" notification after at most 60 seconds
Scenario: MAC address spoofing fails and the module is not removed
Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment