Updated base image

Add unittest to run appium with relaxed security

README.md

@@ -188,9 +188,11 @@ This [document](README_CLOUD.md) contains information about deploying Docker-And
 Genymotion
 ----------
 
-![Genymotion](images/logo_genymotion.png)
+<p align="center">
+  <img id="geny" src="./images/logo_genymotion_and_dockerandroid.png" />
+</p>
 
-For you who do not have ressources to maintain the simulator or to buy machines or need different device profiles, you need to give a try to [Genymotion Cloud](https://www.genymotion.com/cloud/). Docker-Android is integrated with Genymotion on different cloud services, e.g. Genymotion Cloud, AWS, GCP, Alibaba Cloud. Please follow [this document](README_GENYMOTION.md) for more detail.
+For you who do not have ressources to maintain the simulator or to buy machines or need different device profiles, you need to give a try to [Genymotion Cloud](https://www.genymotion.com/cloud/). Docker-Android is integrated with Genymotion on different cloud services, e.g. Genymotion Cloud, AWS, GCP, Alibaba Cloud. Please follow [this document](README_GENYMOTION.md) or [this blog](https://medium.com/genymobile/run-your-appium-tests-using-docker-android-genymotion-cloud-e4817132ccd8) for more detail.
 
 Troubleshooting
 ---------------

README_GENYMOTION.md

@@ -1,6 +1,8 @@
 Genymotion Cloud
 ----------------
 
+![Genymotion](images/logo_genymotion.png)
+
 You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. They are available on SaaS or as virtual images on AWS, GCP or Alibaba Cloud.
 
 1. On SaaS <br />
@@ -11,7 +13,7 @@ You can easily scale your Appium tests on Genymotion Android virtual devices in
 	export PASS="xxx"
 	export LICENSE="xxx"
 
-	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e TYPE=genycloud -e USER=$USER -e PASS=$PASS -e LICENSE=$LICENSE butomo1989/docker-android-genymotion
+	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e TYPE=SaaS -e USER=$USER -e PASS=$PASS -e LICENSE=$LICENSE butomo1989/docker-android-genymotion
 	```
 
 <p align="center">

docker/Emulator_x86

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.1-p0
+FROM appium/appium:1.10.0-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 

docker/Genymotion

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.1-p0
+FROM appium/appium:1.10.0-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 

docker/Real_device

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.1-p0
+FROM appium/appium:1.10.0-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 

genymotion/example/geny.yml

@@ -11,7 +11,7 @@ services:
       - 4444:4444
 
   # Please stop this container by using docker stop instead of docker-compose stop
-  cloud:
+  saas:
     image: butomo1989/docker-android-genymotion
     depends_on:
       - selenium_hub
@@ -20,7 +20,7 @@ services:
       - $PWD/sample_apk:/root/tmp/sample_apk
       - $PWD/sample_devices:/root/tmp
     environment:
-      - TYPE=genycloud
+      - TYPE=SaaS
       - TEMPLATE=/root/tmp/devices.json
       - USER=$USER
       - PASS=$PASS

genymotion/example/sample_devices/aws.json

@@ -32,7 +32,7 @@
 					},
 					{
 						"from_port": 51000,
-						"to_port": 51000,
+						"to_port": 51100,
 						"protocol": "tcp",
 						"cidr_blocks": "0.0.0.0/0"
 					},

genymotion/geny_start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # This script is needed because of https://www.ctl.io/developers/blog/post/gracefully-stopping-docker-containers/
 
-types=(genycloud aws)
+types=(saas aws)
 
 if [ -z "$TYPE" ]; then
     echo "Please specify one of following types: ${types[@]}"

src/appium.sh

@@ -321,7 +321,7 @@ elif [ "$GENYMOTION" = true ]; then
 	echo "${types[@]}"
 	case $TYPE in
 	"${types[0]}" )
-		echo "Using Genymotion-Cloud"
+		echo "Using Genymotion-Cloud (SaaS)"
 		prepare_geny_cloud
 		run_appium
 		;;

src/tests/unit/test_app.py

@@ -64,6 +64,19 @@ class TestApp(TestCase):
             self.assertTrue(mocked_subprocess.called)
             self.assertTrue(mocked_appium.called)
 
+    @mock.patch('src.app.prepare_avd')
+    @mock.patch('builtins.open')
+    @mock.patch('subprocess.Popen')
+    def test_run_with_appium_and_relaxed_security(self, mocked_avd, mocked_open, mocked_subprocess):
+        with mock.patch('src.app.appium_run') as mocked_appium:
+            os.environ['APPIUM'] = str(True)
+            os.environ['RELAXED_SECURITY'] = str(True)
+            app.run()
+            self.assertTrue(mocked_avd.called)
+            self.assertTrue(mocked_open.called)
+            self.assertTrue(mocked_subprocess.called)
+            self.assertTrue(mocked_appium.called)
+
     @mock.patch('src.app.prepare_avd')
     @mock.patch('builtins.open')
     @mock.patch('subprocess.Popen')