Mercurial Repositories > eric / file diff

diff -r eab09a1ab8ce -r 8d3ae97ee666 eric7/UI/UserInterface.py
--- a/eric7/UI/UserInterface.py	Tue May 17 17:23:07 2022 +0200
+++ b/eric7/UI/UserInterface.py	Wed May 18 08:43:36 2022 +0200
@@ -5373,14 +5373,13 @@
         if testFile is None:
             aw = self.viewmanager.activeWindow()
             fn = aw.getFileName()
-            tfn = Utilities.getTestFileName(fn)
-            if os.path.exists(tfn):
-                testFile = tfn
-            else:
-                testFile = fn
+            testFile = [
+                f for f in Utilities.getTestFileNames(fn) + [fn]
+                if os.path.exists(f)
+            ][0]
         
         self.__startTesting()
-        self.__testingWidget.setTestFile(testFile)
+        self.__testingWidget.setTestFile(testFile, forProject=False)
         self.restartTestAct.setEnabled(False)
         self.rerunFailedTestsAct.setEnabled(False)
     
@@ -5393,12 +5392,13 @@
         testFile = None
         fn = self.project.getMainScript(True)
         if fn:
-            tfn = Utilities.getTestFileName(fn)
-            if os.path.exists(tfn):
-                testFile = tfn
+            testFile = [
+                f for f in Utilities.getTestFileNames(fn) + [fn]
+                if os.path.exists(f)
+            ][0]
         
         self.__startTesting()
-        self.__testingWidget.setTestFile(testFile)
+        self.__testingWidget.setTestFile(testFile, forProject=True)
         self.restartTestAct.setEnabled(False)
         self.rerunFailedTestsAct.setEnabled(False)