Updated base image

Check correctly if device exists

docker/Emulator_x86

@@ -1,4 +1,4 @@
-FROM appium/appium:v1.21.0-p0
+FROM appium/appium:v1.21.0-p1
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

docker/Genymotion

@@ -1,4 +1,4 @@
-FROM appium/appium:v1.21.0-p0
+FROM appium/appium:v1.21.0-p1
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

docker/Real_device

@@ -1,4 +1,4 @@
-FROM appium/appium:v1.21.0-p0
+FROM appium/appium:v1.21.0-p1
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

pipelines/release-emulators.yml

@@ -31,6 +31,11 @@ jobs:
       11.0:
         android.version: '11.0'
   steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.5'
+      displayName: 'Use Python 3.5'
+
   - script: |
       latest_tag=$(git describe --tags --abbrev=0)
       echo "##vso[task.setvariable variable=release_version]$latest_tag"

pipelines/release-genymotion-and-device.yml

@@ -13,8 +13,13 @@ jobs:
       genymotion:
         script.name: './release_real.sh'
       real_device:
-        script.name: './release_genymotion.sh'
+        script.name: './release_geny.sh'
   steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.5'
+      displayName: 'Use Python 3.5'
+
   - script: |
       latest_tag=$(git describe --tags --abbrev=0)
       echo "##vso[task.setvariable variable=release_version]$latest_tag"

src/app.py

@@ -3,6 +3,7 @@
 import json
 import logging
 import os
+import re
 import subprocess
 import uuid
 
@@ -56,7 +57,7 @@ def is_initialized(device_name) -> bool:
     if os.path.exists(config_path):
         logger.info('Found existing config file at {}.'.format(config_path))
         with open(config_path, 'r') as f:
-            if any('hw.device.name={}'.format(device_name) in line for line in f):
+            if any(re.match(r'hw\.device\.name ?= ?{}'.format(device_name), line) for line in f):
                 logger.info('Existing config file references {}. Assuming device was previously initialized.'.format(device_name))
                 return True
             else: