r942 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-13 19:39:16 +0000 (Fri, 13 May 2011)
New Revision: 942
Modified:
trunk/tests/info/info.py
Log:
704404 - v7 1.3.43 result missing v7 version information
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2011-05-13 19:38:46 UTC (rev 941)
+++ trunk/tests/info/info.py 2011-05-13 19:39:16 UTC (rev 942)
@@ -30,11 +30,7 @@
self.mandatory = Constants.post # required at the end of each run
# what RHEL are we testing?
self.redHatRelease = RedHatRelease()
- print "Tested OS: %s %s (%s)" % (self.redHatRelease.getProduct(), self.redHatRelease.getVersionPointUpdate(), self.redHatRelease.getCodeName())
-
- print "Kernel RPM: %s" % self.redHatRelease.getKernelRPMName()
- # YK: to show v7 version as well
- print "v7 version %s, release %s" % (v7.version.version, v7.version.release)
+
self.priority = 1000 # run last
def tags(self):
@@ -123,6 +119,15 @@
return False
return True
+
+ def logVersions(self):
+ print "Tested OS: %s %s (%s)" % (self.redHatRelease.getProduct(), self.redHatRelease.getVersionPointUpdate(), self.redHatRelease.getCodeName())
+
+ print "Kernel RPM: %s" % self.redHatRelease.getKernelRPMName()
+ # YK: to show v7 version as well
+ print "v7 version %s, release %s" % (v7.version.version, v7.version.release)
+
+ return True
@@ -413,6 +418,9 @@
def run(self):
success = True
+ if not self.runSubTest(self.logVersions, name="Log versions", description="Log v7 and OS version and release"):
+ success = False
+
if not self.runSubTest(self.checkV7, name="Verify v7", description="Verify the v7 installation"):
success = False
13 years
r941 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-13 19:38:46 +0000 (Fri, 13 May 2011)
New Revision: 941
Modified:
trunk/Makefile
Log:
R44
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-05-03 15:28:00 UTC (rev 940)
+++ trunk/Makefile 2011-05-13 19:38:46 UTC (rev 941)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 43
+V7_RELEASE := 44
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
13 years
r940 - in tags: . v7-V1-3R43/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 15:28:00 +0000 (Tue, 03 May 2011)
New Revision: 940
Added:
tags/v7-V1-3R43/
tags/v7-V1-3R43/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R43/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R43/v7/version.py (rev 0)
+++ tags/v7-V1-3R43/v7/version.py 2011-05-03 15:28:00 UTC (rev 940)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '43'
+rhel_version = '6'
13 years
r939 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 15:27:07 +0000 (Tue, 03 May 2011)
New Revision: 939
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-05-03 15:26:39 UTC (rev 938)
+++ trunk/v7.spec.in 2011-05-03 15:27:07 UTC (rev 939)
@@ -71,7 +71,7 @@
%changelog
* Tue May 03 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.3 R42
+V7 1.3 R43
701621 - suspend test failed on RHEL6
13 years
r938 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 15:26:39 +0000 (Tue, 03 May 2011)
New Revision: 938
Modified:
trunk/Makefile
Log:
R43
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-05-03 15:26:10 UTC (rev 937)
+++ trunk/Makefile 2011-05-03 15:26:39 UTC (rev 938)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 42
+V7_RELEASE := 43
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
13 years
r937 - trunk/tests/suspend
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 15:26:10 +0000 (Tue, 03 May 2011)
New Revision: 937
Modified:
trunk/tests/suspend/suspend.py
Log:
701621 - suspend test failed on RHEL6
Modified: trunk/tests/suspend/suspend.py
===================================================================
--- trunk/tests/suspend/suspend.py 2011-05-03 14:45:55 UTC (rev 936)
+++ trunk/tests/suspend/suspend.py 2011-05-03 15:26:10 UTC (rev 937)
@@ -20,6 +20,7 @@
from v7.tags import Constants, DeviceClass, TestTag
from v7.hal import Hal
from v7.controller import Controller
+from v7.redhatrelease import RedHatRelease
class SuspendTest(Test):
@@ -156,7 +157,7 @@
print "Error: unknown suspend method %s" % method
return False
- if source == Constants.OSCommand:
+ if source == Constants.OSCommand or RedHatRelease().getVersion() == 6:
suspendMessage = "Disabling non-boot CPUs"
if not suspendMessage in log:
print "Error: could not verify suspend"
@@ -164,10 +165,11 @@
# otherwise
print "Verified suspend"
resumeMessage = "Resuming computer"
- if source == Constants.OSCommand:
+ if source == Constants.OSCommand or RedHatRelease().getVersion() == 6:
resumeMessage = "Enabling non-boot CPUs"
if not resumeMessage in log:
print "Error: could not verify resume"
+ return False
# check that they used the correct method
self.verifiedResumeMethod = Constants.memory
13 years
r936 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 14:45:55 +0000 (Tue, 03 May 2011)
New Revision: 936
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-05-03 14:44:56 UTC (rev 935)
+++ trunk/v7.spec.in 2011-05-03 14:45:55 UTC (rev 936)
@@ -69,7 +69,7 @@
%changelog
-* Tue May 03 2001 Greg Nichols <gnichols(a)redhat.com>
+* Tue May 03 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R42
13 years
r935 - in tags: . v7-V1-3R42/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 14:44:56 +0000 (Tue, 03 May 2011)
New Revision: 935
Added:
tags/v7-V1-3R42/
tags/v7-V1-3R42/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R42/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R42/v7/version.py (rev 0)
+++ tags/v7-V1-3R42/v7/version.py 2011-05-03 14:44:56 UTC (rev 935)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '42'
+rhel_version = '6'
13 years
r934 - trunk/tests/suspend
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 14:44:04 +0000 (Tue, 03 May 2011)
New Revision: 934
Modified:
trunk/tests/suspend/suspend.py
Log:
701621 - suspend test failed on RHEL6
Modified: trunk/tests/suspend/suspend.py
===================================================================
--- trunk/tests/suspend/suspend.py 2011-05-03 14:43:21 UTC (rev 933)
+++ trunk/tests/suspend/suspend.py 2011-05-03 14:44:04 UTC (rev 934)
@@ -14,7 +14,7 @@
#
# Author: Greg Nichols
#
-import os, sys, string, shutil, time, syslog
+import os, sys, string, shutil, time, syslog, re
from v7.test import Test
from v7.tags import Constants, DeviceClass, TestTag
@@ -171,9 +171,11 @@
# check that they used the correct method
self.verifiedResumeMethod = Constants.memory
- methodMessage = "swsusp: Need to copy"
- if methodMessage in log:
- self.verifiedResumeMethod = Constants.disk
+ methodMessage = re.compile("(swsusp|PM): Need to copy")
+ for line in log.split('\n'):
+ if methodMessage.search(line):
+ self.verifiedResumeMethod = Constants.disk
+ break
if method != self.verifiedResumeMethod:
print "Error: The suspend method was %s and should have been %s" % (self.verifiedResumeMethod, method)
return False
13 years
r933 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-03 14:43:21 +0000 (Tue, 03 May 2011)
New Revision: 933
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-05-03 14:40:11 UTC (rev 932)
+++ trunk/v7.spec.in 2011-05-03 14:43:21 UTC (rev 933)
@@ -69,6 +69,12 @@
%changelog
+* Tue May 03 2001 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R42
+
+ 701621 - suspend test failed on RHEL6
+
* Mon May 02 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R41
13 years