Browse Source

several fixes for appium integration

bernhardbuhl 4 years ago
parent
commit
a6126b117e

+ 1 - 1
baangt/base/BrowserHandling/BrowserHandling.py

@@ -114,7 +114,7 @@ class BrowserDriver:
                 lCurPath = lCurPath.joinpath(ChromeExecutable)
 
                 if mobileType == 'True':
-                    self.mobileConnectAppium(ChromeExecutable, browserName, desired_app, lCurPath, mobileApp,
+                    self.mobileConnectAppium(ChromeExecutable, browserName, desired_app, mobileApp,
                                              mobile_app_setting)
                 else:
                     if not (os.path.isfile(str(lCurPath))):

+ 1 - 2
baangt/base/TestRun/TestRun.py

@@ -42,7 +42,7 @@ class TestRun:
         self.timing = Timing()
         self.timing.takeTime(GC.TIMING_TESTRUN)  # Initialize Testrun Duration
         self.testRunUtils = TestRunUtils()
-        self._initTestRun()
+        self._initTestRun()   # Loads the globals*.json file
 
         self.browserProxyAndServer = self.getBrowserProxyAndServer() \
             if self.globalSettings.get('TC.' + GC.EXECUTION_NETWORK_INFO) == 'True' else None
@@ -286,7 +286,6 @@ class TestRun:
         if ".XLSX" in self.testRunFileName.upper():
             logger.info(f"Reading Definition from {self.testRunFileName}")
             lExcelImport = TestRunExcelImporter(FileNameAndPath=self.testRunFileName, testRunUtils=self.testRunUtils)
-            self.globalSettings['TC.Mobile'] = "False"
             lExcelImport.importConfig(self.globalSettings)
 
     @staticmethod

BIN
examples/AppTestRunDefinition.xlsx


+ 2 - 1
examples/globalAPP.json

@@ -12,5 +12,6 @@
     "TC.platformVersion": "9",
     "TC.app": "E:\\downloads\\calculator.apk",
     "TC.appPackage": "com.google.android.calculator",
-    "TC.appWaitActivity": "com.android.calculator2.Calculator"
+    "TC.appWaitActivity": "com.android.calculator2.Calculator",
+    "TX.DEBUG": "True"
 }