diff -r 77755a5ea30c -r 4f2dd0850803 PyUnit/UnittestDialog.py
--- a/PyUnit/UnittestDialog.py Sat Mar 11 13:11:29 2017 +0100
+++ b/PyUnit/UnittestDialog.py Sat Mar 11 14:35:22 2017 +0100
@@ -200,12 +200,12 @@
py3Extensions = \
' '.join(["*{0}".format(ext)
for ext in self.dbs.getExtensions('Python3')])
- filter = self.tr(
+ fileFilter = self.tr(
"Python3 Files ({1});;Python2 Files ({0});;All Files (*)")\
.format(py2Extensions, py3Extensions)
else:
- filter = self.tr("Python Files (*.py);;All Files (*)")
- self.testsuitePicker.setFilters(filter)
+ fileFilter = self.tr("Python Files (*.py);;All Files (*)")
+ self.testsuitePicker.setFilters(fileFilter)
@pyqtSlot(str)
def on_testsuitePicker_pathSelected(self, suite):
@@ -504,43 +504,43 @@
self.unittestStopped.emit()
- def testFailed(self, test, exc, id):
+ def testFailed(self, test, exc, testId):
"""
Public method called if a test fails.
@param test name of the test (string)
@param exc string representation of the exception (string)
- @param id id of the test (string)
+ @param testId id of the test (string)
"""
self.failCount += 1
self.progressCounterFailureCount.setText(str(self.failCount))
itm = QListWidgetItem(self.tr("Failure: {0}").format(test))
itm.setData(Qt.UserRole, (test, exc))
self.errorsListWidget.insertItem(0, itm)
- self.__failedTests.append(id)
+ self.__failedTests.append(testId)
- def testErrored(self, test, exc, id):
+ def testErrored(self, test, exc, testId):
"""
Public method called if a test errors.
@param test name of the test (string)
@param exc string representation of the exception (string)
- @param id id of the test (string)
+ @param testId id of the test (string)
"""
self.errorCount += 1
self.progressCounterErrorCount.setText(str(self.errorCount))
itm = QListWidgetItem(self.tr("Error: {0}").format(test))
itm.setData(Qt.UserRole, (test, exc))
self.errorsListWidget.insertItem(0, itm)
- self.__failedTests.append(id)
+ self.__failedTests.append(testId)
- def testSkipped(self, test, reason, id):
+ def testSkipped(self, test, reason, testId):
"""
Public method called if a test was skipped.
@param test name of the test (string)
@param reason reason for skipping the test (string)
- @param id id of the test (string)
+ @param testId id of the test (string)
"""
self.skippedCount += 1
self.progressCounterSkippedCount.setText(str(self.skippedCount))
@@ -548,13 +548,13 @@
itm.setForeground(Qt.blue)
self.testsListWidget.insertItem(1, itm)
- def testFailedExpected(self, test, exc, id):
+ def testFailedExpected(self, test, exc, testId):
"""
Public method called if a test fails expectedly.
@param test name of the test (string)
@param exc string representation of the exception (string)
- @param id id of the test (string)
+ @param testId id of the test (string)
"""
self.expectedFailureCount += 1
self.progressCounterExpectedFailureCount.setText(
@@ -563,12 +563,12 @@
itm.setForeground(Qt.blue)
self.testsListWidget.insertItem(1, itm)
- def testSucceededUnexpected(self, test, id):
+ def testSucceededUnexpected(self, test, testId):
"""
Public method called if a test succeeds unexpectedly.
@param test name of the test (string)
- @param id id of the test (string)
+ @param testId id of the test (string)
"""
self.unexpectedSuccessCount += 1
self.progressCounterUnexpectedSuccessCount.setText(
