summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-01-25 18:39:25 +0000
committerintrigeri <intrigeri@boum.org>2019-01-25 19:26:46 +0000
commitfd82498abd1edf7d67bfcde035abe72152a96fb6 (patch)
treec38f4050bd994cc0be2abb2ac48966dd578240a1
parent3ac90f2ed9a544ce235bf7e520aafc3a50208c81 (diff)
Test suite: remove workaround for race condition that's been fixed (refs: #14596)
It's likely that "Trying to catch the notification at desktop startup is racy" was only due to us not actually disabling the service we meant to disable, which was fixed by 682ea4607780b41a8b94ada84d9b709e2d746b6f; so hopefully this workaround is not needed anymore.
-rw-r--r--features/additional_software_packages.feature6
-rw-r--r--features/step_definitions/additional_software_packages.rb13
2 files changed, 1 insertions, 18 deletions
diff --git a/features/additional_software_packages.feature b/features/additional_software_packages.feature
index 2031f20..7675efe 100644
--- a/features/additional_software_packages.feature
+++ b/features/additional_software_packages.feature
@@ -106,13 +106,9 @@ Feature: Additional software
Given a computer
And I start Tails from USB drive "__internal" with network unplugged
And I enable persistence
- # Trying to catch the notification at desktop startup is racy, so let's
- # start the installation service only once the desktop has settled.
- And I disable the user session's Additional Software installation service
+ And I remove the "cowsay" deb files from the APT cache
And I log in to a new session
And all notifications have disappeared
- And I remove the "cowsay" deb files from the APT cache
- And I start the system-wide Additional Software installation service
Then I see the "The installation of your additional software failed" notification after at most 300 seconds
And I can open the Additional Software log file from the notification
And the package "cowsay" is not installed
diff --git a/features/step_definitions/additional_software_packages.rb b/features/step_definitions/additional_software_packages.rb
index 3e597a8..9bb212c 100644
--- a/features/step_definitions/additional_software_packages.rb
+++ b/features/step_definitions/additional_software_packages.rb
@@ -136,19 +136,6 @@ When /^I can open the Additional Software configuration window from the notifica
asp = Dogtail::Application.new('tails-additional-software-config')
end
-When /^I disable the user session's Additional Software installation service$/ do
- # This service is the one that would otherwise start the system-wide
- # tails-additional-software-install.service
- $vm.execute_successfully('systemctl --global disable tails-additional-software-install.service')
-end
-
-When /^I start the system-wide Additional Software installation service$/ do
- # This service is not enabled by default. In the relevant scenarios,
- # the other service (user session's tails-additional-software-install.service)
- # that would start it was disabled so we need to start this one ourselves.
- $vm.execute_successfully('systemctl --no-block start tails-additional-software-install.service')
-end
-
Then /^I can open the Additional Software log file from the notification$/ do
gnome_shell = Dogtail::Application.new('gnome-shell')
gnome_shell.child('Show Log', roleName: 'push button').click