Attachment 687305 Details for Bug 903975 – suspend: checking correct log message

[patch] suspend: checking correct log message

0001-suspend-use-correct-log-message-in-RHEL7.patch (text/plain), 3.22 KB, created by Caspar Zhang on 2013-01-25 08:14:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caspar Zhang

Created: 2013-01-25 08:14:47 UTC

Size: 3.22 KB

patch

obsolete

>From a87f6aea8751a30ace7fd1627f3291cab97d3cc0 Mon Sep 17 00:00:00 2001
>From: Caspar Zhang <czhang@redhat.com>
>Date: Fri, 25 Jan 2013 15:54:04 +0800
>Subject: [PATCH] suspend: use correct log message in RHEL7
>
>Signed-off-by: Caspar Zhang <czhang@redhat.com>
>---
> tests/suspend/suspend.py | 34 +++++++++++++++++++---------------
> 1 file changed, 19 insertions(+), 15 deletions(-)
>
>diff --git a/tests/suspend/suspend.py b/tests/suspend/suspend.py
>index b835b83..ec9f751 100644
>--- a/tests/suspend/suspend.py
>+++ b/tests/suspend/suspend.py
>@@ -34,8 +34,8 @@ class SuspendTest(Test):
>         #  451154 - failures on unknown suspend methods
>         self.knownMethods = [Constants.memory, Constants.disk]
>         self.suspendMessage = dict()
>-        self.suspendMessage[Constants.memory] = "Suspending computer because the suspend button has been pressed"
>-        self.suspendMessage[Constants.disk] = "Hibernating computer because the hibernate button has been pressed"
>+        self.suspendMessage[Constants.memory] = "Suspend key pressed."
>+        self.suspendMessage[Constants.disk] = "Hibernate key pressed."
> 
>     def tags(self):
>         return [TestTag.interactive, TestTag.certification, TestTag.portable]
>@@ -147,24 +147,29 @@ class SuspendTest(Test):
>         #check system log for acpi messages
>         log = self.v7Controller.getSystemLog("%s-%s-%s" % (self.Name(), source, method))
> 
>-        # 466703 - suspend test fails due to Error: could not verify suspend
>-        # 'suspend' to memory and 'hibernate' to disk have different log messages
>-        try:
>-            suspendMessage = self.suspendMessage[method]
>-        except KeyError:
>-            print "Error: unknown suspend method %s" % method
>-            return False
>+        if source == Constants.FunctionKey:
>+            # check Function Key message (given by systemd) first:
>+            try:
>+                suspendMessage = self.suspendMessage[method]
>+            except KeyError:
>+                print "Error: unknown suspend method %s" % method
>+                return False
> 
>-        if source == Constants.OSCommand or RedHatRelease().getVersion() == 6:
>-            suspendMessage = "Disabling non-boot CPUs"
>+            if not suspendMessage in log:
>+                print "Error: could not verify suspend"
>+                return False
>+
>+        # check suspend/hibernate message (given by kernel)
>+        suspendMessage = "Disabling non-boot CPUs"
>         if not suspendMessage in log:
>             print "Error: could not verify suspend"
>             return False
>+
>         # otherwise
>         print "Verified suspend"
>-        resumeMessage = "Resuming computer"
>-        if source == Constants.OSCommand or RedHatRelease().getVersion() == 6:
>-            resumeMessage = "Enabling non-boot CPUs"
>+
>+        # verifying resuming
>+        resumeMessage = "Enabling non-boot CPUs"
>         if not resumeMessage in log:
>             print "Error: could not verify resume"
>             return False
>@@ -184,7 +189,6 @@ class SuspendTest(Test):
>         print "Verified resume from %s" % self.verifiedResumeMethod
>         return True
> 
>-
>     def runSuspendResume(self, source, method):
>         if self.suspend(source, method):
>             return self.checkResume(source, method)
>-- 
>1.8.1
>

Actions: View | Diff

Attachments on bug 903975: 687305