summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-06-01 14:03:10 +0000
committerintrigeri <intrigeri@boum.org>2016-06-01 14:03:10 +0000
commit0aaeb150e3c42f39f9f2878a4e268433193d6a7d (patch)
tree971f90b834f87af8b1c0d2855e82a038e8f447e5
parent71ac15e8a9d84bbb66260530bbdf177fa8addffc (diff)
parent914bbbc49ecfdd53e7413293c9bd0fcac4f795a6 (diff)
Merge branch 'test/10776-fragile-memory_wipe' into bugfix/10733-run-memory-erasure-hook-earlier
-rw-r--r--features/erase_memory.feature4
1 files changed, 0 insertions, 4 deletions
diff --git a/features/erase_memory.feature b/features/erase_memory.feature
index d3425fd..78aefe3 100644
--- a/features/erase_memory.feature
+++ b/features/erase_memory.feature
@@ -20,8 +20,6 @@ Feature: System memory erasure on shutdown
And I stop the boot at the bootloader menu
Then I find many patterns in the guest's memory
- #10776
- @fragile
Scenario: Memory erasure on a modern computer
Given a computer
And the computer is a modern 64-bit system
@@ -53,8 +51,6 @@ Feature: System memory erasure on shutdown
And I stop the boot at the bootloader menu
Then I find many patterns in the guest's memory
- #10776
- @fragile
Scenario: Memory erasure on an old computer
Given a computer
And the computer is an old pentium without the PAE extension