r1039 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-29 15:19:04 +0000 (Fri, 29 Jul 2011)
New Revision: 1039
Modified:
trunk/Makefile
Log:
R17
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-26 13:58:19 UTC (rev 1038)
+++ trunk/Makefile 2011-07-29 15:19:04 UTC (rev 1039)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 16
+V7_RELEASE := 17
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 9 months
r1038 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-26 13:58:19 +0000 (Tue, 26 Jul 2011)
New Revision: 1038
Modified:
trunk/v7/hardwaretest.py
Log:
725441 - FEAT: save command should store results on server for review
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-07-25 21:11:19 UTC (rev 1037)
+++ trunk/v7/hardwaretest.py 2011-07-26 13:58:19 UTC (rev 1038)
@@ -972,6 +972,11 @@
print savedFilePath
self.certification.compressToFile(savedFilePath)
+ # if it's supplied as an option, use that one but don't save it,
+ # otherwise, check the certification's test server
+ if not self.testServer:
+ self.testServer = self.certification.getTestServer()
+
if self.testServer and self.ui.promptConfirm("Copy results to test server %s?" % self.testServer):
request = V7Http(self.testServer, "/v7/cgi/saveFile.py")
request.addField("server-path", serverPath)
12 years, 9 months
r1037 - trunk/server/cgi
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 21:11:19 +0000 (Mon, 25 Jul 2011)
New Revision: 1037
Modified:
trunk/server/cgi/saved.py
Log:
725441 - FEAT: save command should store results on server for review
Modified: trunk/server/cgi/saved.py
===================================================================
--- trunk/server/cgi/saved.py 2011-07-25 17:24:51 UTC (rev 1036)
+++ trunk/server/cgi/saved.py 2011-07-25 21:11:19 UTC (rev 1037)
@@ -15,7 +15,7 @@
# Author: Greg Nichols
#
-import os,sys,cgi,lxml, re
+import os,sys,cgi,lxml, re, cgitb, time
from lxml import etree
v7ClassLibraryPath = '/usr/share/v7/lib/'
sys.path.append(v7ClassLibraryPath)
@@ -23,11 +23,12 @@
v7ServerRoot = '/var/www/v7'
from v7.environment import Environment
+from v7.tags import Constants
from template import Template
environment = Environment()
-import cgitb
+
cgitb.enable()
@@ -44,7 +45,7 @@
def showSavedResults(parameters):
localPath = os.path.join(environment.getServerDirectory(), "store")
resultsFileFilter = re.compile("\.(xml|xml.gz)$", re.IGNORECASE)
- fileNamePattern = re.compile("^v7-results-(?P<hostname>[^\-]+)-(?P<date>[0-9]+)\.xml(.gz)?$")
+ fileNamePattern = re.compile("^v7-results-(?P<hostname>.*+)-(?P<date>[0-9]+)\.xml(.gz)?$")
for (root,dirs,files) in os.walk(localPath):
files = filter(resultsFileFilter.search, files)
if files:
@@ -56,8 +57,9 @@
if match:
dateStamp = match.group("date")
date = "%s-%s-%s" % (dateStamp[4:6], dateStamp[6:8], dateStamp[:4])
+ time = "%s:%s:%s" % (dateStamp[8:10], dateStamp[10:12], dateStamp[12:])
hostname = match.group("hostname")
- print " <a href=\"v7xml.py?sheet=summary&content=html&rpath=%s/%s\">%s %s</a><br>" % (root, file, hostname, date)
+ print " <a href=\"v7xml.py?sheet=summary&content=html&rpath=%s/%s\">%s %s %s</a><br>" % (root, file, hostname, date, time)
print "<br>"
parameters = getParameters()
12 years, 9 months
r1036 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 17:24:51 +0000 (Mon, 25 Jul 2011)
New Revision: 1036
Added:
tags/v7-V1-4R16/
Log:
tag version
12 years, 9 months
r1035 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 17:24:11 +0000 (Mon, 25 Jul 2011)
New Revision: 1035
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-07-25 17:23:51 UTC (rev 1034)
+++ trunk/v7.spec.in 2011-07-25 17:24:11 UTC (rev 1035)
@@ -79,7 +79,7 @@
%changelog
* Mon Jul 25 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.4 R15
+V7 1.4 R16
725441 - FEAT: save command should store results on server for review
12 years, 9 months
r1034 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 17:23:51 +0000 (Mon, 25 Jul 2011)
New Revision: 1034
Modified:
trunk/Makefile
Log:
R16
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-25 17:22:08 UTC (rev 1033)
+++ trunk/Makefile 2011-07-25 17:23:51 UTC (rev 1034)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 15
+V7_RELEASE := 16
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 9 months
r1033 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 17:22:08 +0000 (Mon, 25 Jul 2011)
New Revision: 1033
Modified:
trunk/v7/certificationtest.py
trunk/v7/hardwaretest.py
Log:
725441 - FEAT: save command should store results on server for review
Modified: trunk/v7/certificationtest.py
===================================================================
--- trunk/v7/certificationtest.py 2011-07-25 16:32:12 UTC (rev 1032)
+++ trunk/v7/certificationtest.py 2011-07-25 17:22:08 UTC (rev 1033)
@@ -149,7 +149,14 @@
element = self.findOrCreateElement(osElement, tag)
return self.getTextNode(element).data
+ def getOSProductShortName(self):
+ longName = self.getOS(Tags.product)
+ if "Red Hat Enterprise Linux" in longName:
+ return "RHEL"
+ #otherwise
+ return longName
+
def appendTest(self, test):
try:
deviceClass = self.deviceClasses[test.getDeviceClass()].appendTest(test)
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-07-25 16:32:12 UTC (rev 1032)
+++ trunk/v7/hardwaretest.py 2011-07-25 17:22:08 UTC (rev 1033)
@@ -953,8 +953,7 @@
path += "/%s" % value
self.makeDirectoryPath(path)
serverPath.append(value)
- for tag in Tags.name, Tags.release:
- value = self.certification.getOS(tag)
+ for value in self.certification.getOSProductShortName(), self.certification.getOS(Tags.release):
if len(value) > 0:
path += "/%s" % value
self.makeDirectoryPath(path)
12 years, 9 months
r1032 - in trunk: server/cgi v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 16:32:12 +0000 (Mon, 25 Jul 2011)
New Revision: 1032
Modified:
trunk/server/cgi/saveFile.py
trunk/v7/documentbase.py
Log:
725441 - FEAT: save command should store results on server for review
Modified: trunk/server/cgi/saveFile.py
===================================================================
--- trunk/server/cgi/saveFile.py 2011-07-25 14:20:26 UTC (rev 1031)
+++ trunk/server/cgi/saveFile.py 2011-07-25 16:32:12 UTC (rev 1032)
@@ -43,12 +43,10 @@
except:
print "Error: no server-path is set"
return False
- print "server-path:"
+
if serverPath.value:
- serverPath = os.path.join(*serverPath.value.split())
- print serverPath
+ serverPath = os.path.join(*serverPath.value.splitlines())
directory = os.path.join(environment.getServerDirectory(), "store", serverPath)
- print "directory %s" % directory
try:
os.makedirs(directory)
except OSError:
Modified: trunk/v7/documentbase.py
===================================================================
--- trunk/v7/documentbase.py 2011-07-25 14:20:26 UTC (rev 1031)
+++ trunk/v7/documentbase.py 2011-07-25 16:32:12 UTC (rev 1032)
@@ -272,7 +272,7 @@
except:
pass
try:
- gzip = Command("gzip %s" % filename)
+ gzip = Command("gzip \"%s\"" % filename)
gzip.run()
return True
except Exception, exception:
12 years, 9 months
r1031 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 14:20:26 +0000 (Mon, 25 Jul 2011)
New Revision: 1031
Added:
tags/v7-V1-4R15/
Log:
tag version
12 years, 9 months
r1030 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-25 14:19:54 +0000 (Mon, 25 Jul 2011)
New Revision: 1030
Modified:
trunk/v7.spec.in
Log:
changlog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-07-25 14:18:04 UTC (rev 1029)
+++ trunk/v7.spec.in 2011-07-25 14:19:54 UTC (rev 1030)
@@ -77,6 +77,12 @@
%changelog
+* Mon Jul 25 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.4 R15
+
+ 725441 - FEAT: save command should store results on server for review
+
* Thu Jul 21 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.4 R14
12 years, 9 months