Update memory jobs to work on snappy

1 files changed, 17 insertions, 2 deletions

diff --git a/jobs/memory.txt.in b/jobs/memory.txt.in
index b324545..e791d37 100644
--- a/jobs/memory.txt.in
+++ b/jobs/memory.txt.in
@@ -5,7 +5,7 @@ estimated_duration: 5.0
 user: root
 command: memory_compare
 _summary:
- Test that meminfo matches DMI memory information
+ Check amount of memory reported by meminfo against DMI
 _description:
 This test checks the amount of memory which is reporting in meminfo against
 the size of the memory modules detected by DMI.
@@ -18,6 +18,8 @@ user: root
 requires:
 uname.name == 'Linux'
 command: memory_test
+_summary:
+ Run memory stress test including swapping to disk
 _description:
 Test to perform some basic stress and exercise of system memory. This test
 also includes an over-commit function to force swapping to disk, thus SUTs
@@ -26,11 +28,24 @@ _description:
 
 plugin: shell
 category_id: 2013.com.canonical.plainbox::memory
+id: memory/meminfo_before_suspend
+estimated_duration: 1.2
+_summary: Store memory info before suspending
+command: meminfo_resource > $PLAINBOX_SESSION_SHARE/meminfo_before_suspend
+_siblings: [
+ { "id": "after-suspend-memory/meminfo_after_suspend",
+ "_summary": "Compare memory info to the state prior to suspend",
+ "command": "meminfo_resource | diff $PLAINBOX_SESSION_SHARE/meminfo_before_suspend -",
+ "depends": "2013.com.canonical.certification::suspend/suspend_advanced_auto"}
+ ]
+
+plugin: shell
+category_id: 2013.com.canonical.plainbox::memory
 id: memory/memory_stress_ng
 estimated_duration: 11000.0
 user: root
 requires:
- package.name == 'stress-ng'
+ package.name == 'stress-ng' or executable.name == 'stress-ng'
 command: memory_stress_ng
 _summary: Stress test of system memory
 _description: