[master 6/8] Fix all the places we're redefining something.
clumens
installerbot-noreply at redhat.com
Thu Jul 16 19:58:06 UTC 2015
From: Chris Lumens <clumens at redhat.com>
---
tests/baseclass.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/baseclass.py b/tests/baseclass.py
index 007a372..d242ce3 100644
--- a/tests/baseclass.py
+++ b/tests/baseclass.py
@@ -27,7 +27,7 @@ def openFile(self, mode="w"):
return (fo, path)
- def tracebackContains(self, path, str):
+ def tracebackContains(self, path, s):
f = open(path)
while True:
l = f.readline()
@@ -35,7 +35,7 @@ def tracebackContains(self, path, str):
f.close()
return False
- if l.find(str) != -1:
+ if l.find(s) != -1:
f.close()
return True
@@ -52,7 +52,7 @@ def loadModules(moduleDir, cls_pattern="_TestCase", skip_list=None):
if skip_list.count("__init__") == 0:
skip_list.append("__init__")
- tstList = list()
+ tests = list()
# Make sure moduleDir is in the system path so imputil works.
if not moduleDir in sys.path:
@@ -75,18 +75,18 @@ def loadModules(moduleDir, cls_pattern="_TestCase", skip_list=None):
continue
# Find class names that match the supplied pattern (default: "_TestCase")
- beforeCount = len(tstList)
+ beforeCount = len(tests)
for obj in loaded.__dict__.keys():
if obj.endswith(cls_pattern):
- tstList.append(loaded.__dict__[obj])
- afterCount = len(tstList)
+ tests.append(loaded.__dict__[obj])
+ afterCount = len(tests)
# Warn if no tests found
if beforeCount == afterCount:
print("Module %s does not contain any test cases; skipping." % module)
continue
- return tstList
+ return tests
# Run the tests
if __name__ == "__main__":
--
To view this commit on github, visit https://github.com/rhinstaller/python-meh/commit/44ea80efee3b75a9e76ce1a4fe06af38f0e1a1d6
More information about the anaconda-patches
mailing list