Author: gnichols
Date: 2011-01-31 21:18:14 +0000 (Mon, 31 Jan 2011)
New Revision: 765
Modified:
trunk/tests/info/info.py
Log:
589739 - CPUSCALING test includes unprocessed tags around displayed text
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2011-01-31 21:17:05 UTC (rev 764)
+++ trunk/tests/info/info.py 2011-01-31 21:18:14 UTC (rev 765)
@@ -135,7 +135,6 @@
print "Error: Verification of v7 rpm failed"
# 451074: FEAT: save any modified test files
pyFilePattern= re.compile(".*\.py$")
- outputDirectory = os.path.dirname(self.outputFile)
found = False
for line in rpmVerify.output:
tokens = line.split()
@@ -146,7 +145,7 @@
found = True
print "Saving modified source files:"
print tokens[1]
- shutil.copy(tokens[1], outputDirectory)
+ shutil.copy(tokens[1], self.getOutputDirectory())
return verified
@@ -387,9 +386,8 @@
sys.stdout.flush()
if tarFile:
- outputDirectory = os.path.dirname(self.outputFile)
- shutil.copy(tarFile, outputDirectory)
- print "Copied %s %s to %s" % (reportCommand, tarFile,
outputDirectory)
+ shutil.copy(tarFile, self.getOutputDirectory())
+ print "Copied %s %s to %s" % (reportCommand, tarFile,
self.getOutputDirectory())
sys.stdout.flush()
result = True
break
Show replies by date