Filename from globals and better error messages

baangt/base/GlobalConstants.py

@@ -81,6 +81,7 @@ EXECUTION_STAGE_QA = 'Quality Assurance'
 
 EXPORT_FORMAT = "ExportFormat"
 EXPORT_ADDITIONAL_DATA = "AdditionalExportTabs"
+EXPORT_FILENAME = "ExportFilenameAndPath"
 EXP_FIELDLIST = "Fieldlist"
 EXP_XLSX = "XLSX"
 EXP_CSV = "CSV"

baangt/base/IBAN.py

@@ -1,4 +1,4 @@
-#import schwifty
+import schwifty
 from baangt.base.Faker import Faker
 import random
 
@@ -26,9 +26,9 @@ class IBAN:
         for n in range(laenge):
             digits.append(random.randrange(0, 10))
         digits = "".join(str(x) for x in digits)
-        #return str(schwifty.IBAN.generate(country_code=self.bankLand,
-        #                                  bank_code=self.bankLeitZahl,
-        #                                  account_code=digits))
+        return str(schwifty.IBAN.generate(country_code=self.bankLand,
+                                          bank_code=self.bankLeitZahl,
+                                          account_code=digits))
         return Faker().fakerProxy(fakerMethod="iban")
 
 

baangt/base/TestRun/TestRun.py

@@ -99,7 +99,7 @@ class TestRun:
         try:
             Sender.send_all(self.results, self.globalSettings)
         except Exception as ex:
-            logger.debug(ex)
+            logger.error(f"Error from SendAll: {ex}")
 
     def append1DTestCaseEndDateTimes(self, dt):
         self.testCasesEndDateTimes_1D.append(dt)

baangt/base/TestRunExcelImporter.py

@@ -81,14 +81,16 @@ class TestRunExcelImporter:
                 "TestDataFileName": self.fileName,
                 "Sheetname": "data",
                 "ParallelRuns": 1,
-                "Lines": "0-999999"
+                "Lines": "0-999999",
+                GC.EXPORT_FILENAME: ""
                 },
             }
         for key, sequence in lSequenceDict.items():
             testrunSequence[key] = [sequence["SequenceClass"], {}]
             for field, value in sequence.items():
                 testRunAttributes[GC.STRUCTURE_TESTCASESEQUENCE][key][1][field] = value
-
+            if not testRunAttributes[GC.STRUCTURE_TESTCASESEQUENCE][key][1].get(GC.EXPORT_FILENAME):
+                testRunAttributes[GC.STRUCTURE_TESTCASESEQUENCE][key][1][GC.EXPORT_FILENAME]=None
 
         xlsTab = self._getTab("TestCase")
         # if Tab "TestCase" exists, then take the definitions from there. Otherwise (means simpleFormat)