r861 - in tags: . v7-V1-3R26/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 15:19:09 +0000 (Thu, 31 Mar 2011)
New Revision: 861
Added:
tags/v7-V1-3R26/
tags/v7-V1-3R26/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R26/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R26/v7/version.py (rev 0)
+++ tags/v7-V1-3R26/v7/version.py 2011-03-31 15:19:09 UTC (rev 861)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '26'
+rhel_version = '6'
13 years, 1 month
r860 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 15:18:33 +0000 (Thu, 31 Mar 2011)
New Revision: 860
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-03-31 15:18:04 UTC (rev 859)
+++ trunk/v7.spec.in 2011-03-31 15:18:33 UTC (rev 860)
@@ -69,7 +69,7 @@
%changelog
* Thu Mar 31 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.3 R25
+V7 1.3 R26
677752 - FEAT: network test ICMP/ping test improvements
593982 - FEAT: test suite to remind users before the results.xml file becomes too large
13 years, 1 month
r859 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 15:18:04 +0000 (Thu, 31 Mar 2011)
New Revision: 859
Modified:
trunk/Makefile
Log:
R26
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-03-31 15:17:37 UTC (rev 858)
+++ trunk/Makefile 2011-03-31 15:18:04 UTC (rev 859)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 25
+V7_RELEASE := 26
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, 1 month
r858 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 15:17:37 +0000 (Thu, 31 Mar 2011)
New Revision: 858
Modified:
trunk/v7/documentbase.py
Log:
593982 - FEAT: test suite to remind users before the results.xml file becomes too large
Modified: trunk/v7/documentbase.py
===================================================================
--- trunk/v7/documentbase.py 2011-03-31 12:41:05 UTC (rev 857)
+++ trunk/v7/documentbase.py 2011-03-31 15:17:37 UTC (rev 858)
@@ -14,7 +14,7 @@
#
# Author: Greg Nichols
#
-import string, sys
+import string, sys, os
import time, datetime
from xml.dom.minidom import getDOMImplementation, parse
import xml.dom.ext
@@ -223,6 +223,11 @@
class DocumentBase(DocumentWrapper):
+ def __init__(self):
+ DocumentWrapper.__init__(self)
+ self.loadedFilePath = None
+ self.loadedFileSize = 0 # bytes
+
def _new(self, topElement, stylesheet):
dom = getDOMImplementation()
self.document = dom.createDocument(None, topElement, None)
@@ -236,6 +241,11 @@
def load(self, filename):
+ self.loadedFilePath = filename
+ try:
+ self.loadedFileSize = os.path.getsize(self.loadedFilePath) # bytes
+ except OSError:
+ pass
file = open(filename, "r")
self.document = parse(file)
file.close()
@@ -261,6 +271,13 @@
oldTopElement = self.document.childNodes[0]
self.document.replaceChild(newTopElement, oldTopElement)
self.element = self.document.documentElement
+
+ def getLoadedFileSize(self):
+ """ return the size of the loaded xml file in bytes """
+ return self.loadedFileSize
+
+ def getLoadedFilePath(self):
+ return self.loadedFilePath
if __name__ == '__main__':
@@ -315,3 +332,4 @@
+
13 years, 1 month
r857 - in tags: . v7-V1-3R25/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 12:41:05 +0000 (Thu, 31 Mar 2011)
New Revision: 857
Added:
tags/v7-V1-3R25/
tags/v7-V1-3R25/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R25/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R25/v7/version.py (rev 0)
+++ tags/v7-V1-3R25/v7/version.py 2011-03-31 12:41:05 UTC (rev 857)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '25'
+rhel_version = '6'
13 years, 1 month
r856 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 12:40:08 +0000 (Thu, 31 Mar 2011)
New Revision: 856
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-03-31 12:39:20 UTC (rev 855)
+++ trunk/v7.spec.in 2011-03-31 12:40:08 UTC (rev 856)
@@ -67,6 +67,15 @@
/etc/init.d/v7
%changelog
+* Thu Mar 31 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R25
+
+ 677752 - FEAT: network test ICMP/ping test improvements
+ 593982 - FEAT: test suite to remind users before the results.xml file becomes too large
+ 618358 - v7 server - fencing test requires fence-agents rpm
+
+
* Tue Mar 29 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R24
13 years, 1 month
r855 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 12:39:20 +0000 (Thu, 31 Mar 2011)
New Revision: 855
Modified:
trunk/v7/hardwaretest.py
Log:
618358 - v7 server - fencing test requires fence-agents rpm\n 593982 - FEAT: test suite to remind users before the results.xml file becomes too large
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-03-31 12:33:36 UTC (rev 854)
+++ trunk/v7/hardwaretest.py 2011-03-31 12:39:20 UTC (rev 855)
@@ -455,7 +455,7 @@
# check server=specific rpms
if subcommand == "start":
# server web CGI uses XSLT via python-lxml
- if not self.installRequiredRPMs({"python-lxml": "python-lxml"}):
+ if not self.installRequiredRPMs({"python-lxml": "python-lxml", "fence-agents": "fence-agents"}):
result = 1
for test in tests:
rv = self.runServer(test, subcommand)
@@ -847,6 +847,14 @@
def __verify(self, testDocuments):
+ # check the results file size
+ result = True
+ if self.certification.getLoadedFileSize() > self.environment.getResultsWarningSize():
+ result = False
+ print "Warning: the test results may be too large to submit to the hardware catalog."
+ print "File: %s is %u MB" % (self.certification.getLoadedFilePath(), int(self.certification.getLoadedFileSize()/1048576))
+
+
# just call verify on each test directly
failures = 0
13 years, 1 month
r854 - trunk/tests/network
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 12:33:36 +0000 (Thu, 31 Mar 2011)
New Revision: 854
Modified:
trunk/tests/network/network.py
Log:
677752 - FEAT: network test ICMP/ping test improvements
Modified: trunk/tests/network/network.py
===================================================================
--- trunk/tests/network/network.py 2011-03-31 12:30:48 UTC (rev 853)
+++ trunk/tests/network/network.py 2011-03-31 12:33:36 UTC (rev 854)
@@ -352,26 +352,30 @@
# icmpTest uses ping with various packet sizes
def icmpTest(self):
# (<bytes in packet>, <percent lost for warning>)
- packetSizes = [(0, 0), (1, 0), (240, 10), (256, 15), (1024, 20), (2000, 30), (10000, 40), (40000, 60), (65507, 80)]
- try:
- for (size, warnLoss) in packetSizes:
- sizeParam = ""
- if size > 0:
- sizeParam = "-s %s" % size
- ping = Command("/bin/ping -i 0 -q -c 1000 %s %s" % (sizeParam, self.getTestServer()))
+ # prior release packed sizes, with some margins
+ # packetSizes = [(0, 0), (1, 0), (240, 10), (256, 15), (1024, 20), (2000, 30), (10000, 40), (40000, 60), (65507, 80)]
+ # We now use default packet size, 100% margin, allowing 5 retries (see BZ 677752 )
+ retries = 5
+ packetCount = 5000
+ lossMargin = 0
+ while retries > 0:
+ try:
+ ping = Command("/bin/ping -i 0 -q -c %u %s" % (packetCount, self.getTestServer()))
print ping.command
packetLoss = ping.getString(regex="^.*, (?P<packetLoss>[0-9]+)% packet loss.*$", regexGroup="packetLoss", singleLine=False)
ping.printOutput()
- if int(packetLoss) > warnLoss:
- print "Warning: packet loss of %s%% is greater than %s%% expected" % (packetLoss, warnLoss)
- except V7CommandException, exception:
- print "Error:"
- print exception
- ping.printErrors()
- return False
+ if int(packetLoss) <= lossMargin:
+ return True
+ # otherwise
+ print "Note: packet loss of %s%% is greater than %s%% expected" % (packetLoss, lossMargin)
+ except V7CommandException, exception:
+ print "Warning:"
+ print exception
+ ping.printErrors()
+ retries = retries -1
# otherwise
- return True
+ return False
def tcpTest(self):
# lat_tcp and bw_tcp report results on stderr, so
13 years, 1 month
r853 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 12:30:48 +0000 (Thu, 31 Mar 2011)
New Revision: 853
Modified:
trunk/Makefile
Log:
R25
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-03-31 02:32:26 UTC (rev 852)
+++ trunk/Makefile 2011-03-31 12:30:48 UTC (rev 853)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 24
+V7_RELEASE := 25
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, 1 month
r852 - trunk/tests/reboot
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-31 02:32:26 +0000 (Thu, 31 Mar 2011)
New Revision: 852
Modified:
trunk/tests/reboot/reboot.py
Log:
626970 - FEAT: kdump test needs to verify kdump
Modified: trunk/tests/reboot/reboot.py
===================================================================
--- trunk/tests/reboot/reboot.py 2011-03-29 13:19:46 UTC (rev 851)
+++ trunk/tests/reboot/reboot.py 2011-03-31 02:32:26 UTC (rev 852)
@@ -34,9 +34,13 @@
self.deviceClass = DeviceClass.system
self.environment = Environment()
self.continuation = Continuation(self.environment)
- self.rebootTimeLimit = 10 # minutes
+ self.rebootTimeLimit = self.environment.getRebootTimelimit()
self.priority = 1001 # run last
+ def getRequiredRPMs(self):
+ rpms = ["kernel-debug", "kernel-debuginfo"]
+ return rpms
+
def tags(self):
return [TestTag.noninteractive, TestTag.certification]
13 years, 1 month