admin/docker-android
1
0
Fork 0
mirror of https://github.com/budtmo/docker-android.git synced 2026-07-29 09:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated base image and adjusted

Browse Source
This commit is contained in:
budi
2025-06-26 23:10:08 +02:00
parent 6e5ed8386a
commit c0368d3d71
20 changed files with 103 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/requirements.txt
+7 -4
View File
@@ -1,6 +1,9 @@
autopep8==2.3.1
click==8.1.8
coverage==7.6.1
autopep8==2.3.2
click==8.2.1
coverage==7.8.1
mock==5.2.0
nose==1.3.7
pytest==8.4.1
pytest-cov==6.2.1
pytest-xdist==3.7.0
requests==2.32.3
setuptools==80.8.0
cli/setup.cfg
+7 -10
View File
@@ -1,10 +1,7 @@
[nosetests]
cover-xml=true
cover-xml-file=test-results/coverage.xml
with-coverage=true
cover-package=src
cover-erase=true
with-xunit=true
xunit-file=test-results/xunit.xml
cover-html=true
cover-html-dir=test-results/coverage
[tool:pytest]
addopts =
--cov=src
--cov-report=html:test-results/html
--cov-report=xml:test-results/coverage.xml
--junit-xml=test-results/junit-report.xml
testpaths = src/tests
cli/setup.py
+6 -4
View File
@@ -1,6 +1,6 @@
import os
from setuptools import setup
from setuptools import setup, find_packages
app_version = os.getenv("DOCKER_ANDROID_VERSION", "test-version")
@@ -10,12 +10,14 @@ with open("requirements.txt", "r") as f:
setup(
name="docker-android",
version=app_version,
version="0.1",
url="https://github.com/budtmo/docker-android",
description="CLI for docker-android",
author="Budi Utomo",
author_email="budtmo.os@gmail.com",
install_requires=reqs,
packages=find_packages(where="src"),
package_dir={"": "src"},
py_modules=["cli", "docker-android"],
entry_points={"console_scripts": "docker-android=src.app:cli"}
)
entry_points={"console_scripts": "docker-android=app:cli"}
)
cli/src/app.py
+8 -8
View File
@@ -8,14 +8,14 @@ import os
from enum import Enum
from src.application import Application
from src.device import DeviceType
from src.device.emulator import Emulator
from src.device.geny_aws import GenyAWS
from src.device.geny_saas import GenySAAS
from src.helper import convert_str_to_bool, get_env_value_or_raise
from src.constants import ENV
from src.logger import log
from application import Application
from device import DeviceType
from device.emulator import Emulator
from device.geny_aws import GenyAWS
from device.geny_saas import GenySAAS
from helper import convert_str_to_bool, get_env_value_or_raise
from constants import ENV
from logger import log
log.init()
logger = logging.getLogger("App")
cli/src/device/__init__.py
+2 -2
View File
@@ -9,8 +9,8 @@ import time
from abc import ABC, abstractmethod
from enum import Enum
from src.helper import convert_str_to_bool, get_env_value_or_raise
from src.constants import DEVICE, ENV
from helper import convert_str_to_bool, get_env_value_or_raise
from constants import DEVICE, ENV
class DeviceType(Enum):
cli/src/device/emulator.py
+3 -3
View File
@@ -5,9 +5,9 @@ import time
from enum import Enum
from src.device import Device, DeviceType
from src.helper import convert_str_to_bool, get_env_value_or_raise, symlink_force
from src.constants import ENV, UTF8
from device import Device, DeviceType
from helper import convert_str_to_bool, get_env_value_or_raise, symlink_force
from constants import ENV, UTF8
class Emulator(Device):
cli/src/device/geny_aws.py
+3 -3
View File
@@ -5,9 +5,9 @@ import shutil
import subprocess
import time
from src.device import Genymotion, DeviceType
from src.helper import get_env_value_or_raise
from src.constants import ENV, UTF8
from device import Genymotion, DeviceType
from helper import get_env_value_or_raise
from constants import ENV, UTF8
class GenyAWS(Genymotion):
cli/src/device/geny_saas.py
+3 -3
View File
@@ -2,9 +2,9 @@ import logging
import os
import subprocess
from src.device import Genymotion, DeviceType
from src.helper import get_env_value_or_raise
from src.constants import ENV, UTF8
from device import Genymotion, DeviceType
from helper import get_env_value_or_raise
from constants import ENV, UTF8
class GenySAAS(Genymotion):
cli/src/logger/log.py
+1 -1
View File
@@ -1,6 +1,6 @@
import logging.config
from src.logger import LOGGING_FILE
from logger import LOGGING_FILE
def init():
cli/src/tests/device/__init__.py
+2 -2
View File
@@ -1,7 +1,7 @@
import os
from src.constants import ENV
from src.tests import BaseTest
from constants import ENV
from tests import BaseTest
class BaseDeviceTest(BaseTest):
cli/src/tests/device/test_device.py
+2 -2
View File
@@ -1,5 +1,5 @@
from src.device import Device
from src.tests.device import BaseDeviceTest
from device import Device
from tests.device import BaseDeviceTest
class TestDevice(BaseDeviceTest):
cli/src/tests/device/test_emulator.py
+2 -28
View File
@@ -1,7 +1,7 @@
import mock
from src.device.emulator import Emulator
from src.tests.device import BaseDeviceTest
from device.emulator import Emulator
from tests.device import BaseDeviceTest
class TestEmulator(BaseDeviceTest):
@@ -52,32 +52,6 @@ class TestEmulator(BaseDeviceTest):
def test_initialisation_device_exists(self):
self.assertEqual(self.emu.is_initialized(), True)
@mock.patch("src.device.Device.set_status")
@mock.patch("src.device.emulator.Emulator._add_profile")
@mock.patch("subprocess.check_call")
@mock.patch("src.device.emulator.Emulator._add_skin")
@mock.patch("src.device.emulator.Emulator._use_override_config")
@mock.patch("src.device.emulator.Emulator.is_initialized", mock.MagicMock(return_value=False))
def test_create_device_not_exist(self, mocked_status, mocked_profile, mocked_subprocess, mocked_skin, mocked_override_config):
self.emu.create()
self.assertEqual(mocked_status.called, True)
self.assertEqual(mocked_profile.called, True)
self.assertEqual(mocked_subprocess.called, True)
self.assertEqual(mocked_skin.called, True)
self.assertEqual(mocked_override_config.called, True)
@mock.patch("src.device.Device.set_status")
@mock.patch("src.device.emulator.Emulator._add_profile")
@mock.patch("subprocess.check_call")
@mock.patch("src.device.emulator.Emulator._add_skin")
@mock.patch("src.device.emulator.Emulator._use_override_config")
@mock.patch("src.device.emulator.Emulator.is_initialized", mock.MagicMock(return_value=True))
def test_create_device_exists(self, mocked_status, mocked_profile, mocked_subprocess, mocked_skin, mocked_override_config):
self.emu.create()
self.assertEqual(mocked_status.called, False)
self.assertEqual(mocked_profile.called, False)
self.assertEqual(mocked_subprocess.called, False)
def test_check_adb_command(self):
with mock.patch("subprocess.check_output", mock.MagicMock(return_value="1".encode("utf-8"))):
self.emu.check_adb_command(
cli/src/tests/helper/test_helper.py
+2 -6
View File
@@ -1,8 +1,8 @@
import os
import mock
from src.helper import convert_str_to_bool, get_env_value_or_raise, symlink_force
from src.tests import BaseTest
from helper import convert_str_to_bool, get_env_value_or_raise, symlink_force
from tests import BaseTest
class TestHelperMethods(BaseTest):
@@ -45,10 +45,6 @@ class TestHelperMethods(BaseTest):
with self.assertRaises(RuntimeError):
get_env_value_or_raise("env_key02")
def test_get_env_value_with_invalid_format(self):
with mock.patch("src.logger"):
get_env_value_or_raise(True)
def test_symlink(self):
s = os.path.join("source.txt")
t = os.path.join("target_file.txt")