summaryrefslogtreecommitdiffstats
path: root/features
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-02-15 07:16:20 +0000
committerintrigeri <intrigeri@boum.org>2019-02-15 07:16:20 +0000
commitf6a3da1b1b040ad5b1b37590be5f7f282c5b389e (patch)
treeecb6fdb8edf7cb67803b3b3932c8e12ad6613c5d /features
parent4f6b0687410b5e0bc051958a594aac96ecb430e1 (diff)
Test suite: only check that persistence.conf.bak exists on recent enough Tails (refs: #16461).
This makes our test suite pass even when --old-iso points to Tails 3.12, by skipping a new test that would not work there. More specifically, the "Writing files to a read/write-enabled persistent partition with the old Tails USB installation" scenario would fail. Else, whenever --old-iso is not passed at all, or it points to an ISO built from a branch that has the code which creates persistence.conf.bak (#16461), we'll check for its existence and access rights.
Diffstat (limited to 'features')
-rw-r--r--features/step_definitions/usb.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index f97c0b2..7a8306d 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -556,8 +556,10 @@ Then /^all persistence configuration files have safe access rights$/ do
persistent_volumes_mountpoints.each do |mountpoint|
assert($vm.execute("test -e #{mountpoint}/persistence.conf").success?,
"#{mountpoint}/persistence.conf does not exist, while it should")
- assert($vm.execute("test -e #{mountpoint}/persistence.conf.bak").success?,
- "#{mountpoint}/persistence.conf.bak does not exist, while it should")
+ if running_tails_version.to_f >= 3.13
+ assert($vm.execute("test -e #{mountpoint}/persistence.conf.bak").success?,
+ "#{mountpoint}/persistence.conf.bak does not exist, while it should")
+ end
assert($vm.execute("test ! -e #{mountpoint}/live-persistence.conf").success?,
"#{mountpoint}/live-persistence.conf does exist, while it should not")
$vm.execute(