summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-01-03 17:14:57 +0000
committerintrigeri <intrigeri@boum.org>2018-01-03 17:15:58 +0000
commitadc02fc5630c1c2bd867a538f053a72ca8317f9a (patch)
tree3ce3af99658bf8b59483eb619851af87e136e492
parentc9eff914dd8e6b023e9ba24ead85ab506fc6afb6 (diff)
Adjust test suite: aufs → overlayfswip/feature/8415-overlayfs-stretch
-rw-r--r--features/emergency_shutdown.feature2
-rw-r--r--features/erase_memory.feature2
-rw-r--r--features/step_definitions/common_steps.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/features/emergency_shutdown.feature b/features/emergency_shutdown.feature
index 56a3d8a..cf00b01 100644
--- a/features/emergency_shutdown.feature
+++ b/features/emergency_shutdown.feature
@@ -10,7 +10,7 @@ Feature: Emergency shutdown
When I eject the boot medium
Then Tails eventually shuts down
- Scenario: Tails erases memory on DVD boot medium removal: aufs read-write branch
+ Scenario: Tails erases memory on DVD boot medium removal: overlayfs read-write branch
Given I have started Tails from DVD without network and logged in
And I prepare Tails for memory erasure tests
And I fill a 128 MiB file with a known pattern on the root filesystem
diff --git a/features/erase_memory.feature b/features/erase_memory.feature
index 5596344..d22f5ad 100644
--- a/features/erase_memory.feature
+++ b/features/erase_memory.feature
@@ -59,7 +59,7 @@ Feature: System memory erasure on shutdown
When I umount the USB drive
Then I find very few patterns in the guest's memory
- Scenario: Erasure of the aufs read-write branch on shutdown
+ Scenario: Erasure of the overlayfs read-write branch on shutdown
Given I have started Tails from DVD without network and logged in
And I prepare Tails for memory erasure tests
When I fill a 128 MiB file with a known pattern on the root filesystem
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 88fd3d4..66ee9c0 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -642,7 +642,7 @@ def is_persistent?(app)
conf = get_persistence_presets(true)["#{app}"]
c = $vm.execute("findmnt --noheadings --output SOURCE --target '#{conf}'")
# This check assumes that we haven't enabled read-only persistence.
- c.success? and c.stdout.chomp != "aufs"
+ c.success? and c.stdout.chomp != "overlay"
end
Then /^persistence for "([^"]+)" is (|not )enabled$/ do |app, enabled|