summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2018-11-08 09:29:21 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2018-11-08 09:29:21 +0100
commit4a3ed3b5aec9ddacf9fa72fad198081c410cc18f (patch)
tree113fe2b39c8cd976764f93a6a1d1e81f895fb4f7
parentf8dce38cd913ce771c1aea1c76408ac9671aef7a (diff)
Test suite: Fix condition on empty file in ASP step.
Now that file_empty? errors out if file does not exist, we have to check for its presence now. Refs: #14596
-rw-r--r--features/step_definitions/additional_software_packages.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/step_definitions/additional_software_packages.rb b/features/step_definitions/additional_software_packages.rb
index b8d2786..46b01dd 100644
--- a/features/step_definitions/additional_software_packages.rb
+++ b/features/step_definitions/additional_software_packages.rb
@@ -2,7 +2,7 @@ ASP_STATE_DIR = "/run/live-additional-software"
ASP_CONF = '/live/persistence/TailsData_unlocked/live-additional-software.conf'
Then /^the Additional Software (upgrade|installation) service has started$/ do |service|
- if !$vm.file_empty?('/live/persistence/TailsData_unlocked/live-additional-software.conf')
+ if $vm.file_exists?(ASP_CONF) and !$vm.file_empty?(ASP_CONF)
case service
when "installation"
service = "tails-additional-software-install"