Skip to content

Commit a01b308

Browse files
committed
normalize whitespace in test files
1 parent b6a2a4f commit a01b308

3 files changed

Lines changed: 15 additions & 12 deletions

File tree

tests/android/installer/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,4 +243,4 @@ def test_setup_with_force(self, mock_ensure):
243243
assert result.exit_code == 0
244244
# Force flag should be passed
245245
call_kwargs = mock_ensure.call_args[1]
246-
assert "force" in call_kwargs
246+
assert "force" in call_kwargs

tests/android/installer/test_core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ def test_check_permissions_failure(self):
161161
"""Test permission check failure."""
162162
import os
163163
import platform
164-
164+
165165
# Skip on Windows as permission model is different
166166
if platform.system() == "Windows":
167167
pytest.skip("Windows permission model differs")
168-
168+
169169
# Make directory read-only
170170
os.chmod(self.sdk_root, 0o444)
171171

tests/android/installer/test_ndk_coverage.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,23 @@ def test_get_version_with_source_properties(self):
7575
ndk_path = self.sdk_root / "ndk" / "26.1.10909125"
7676
ndk_path.mkdir(parents=True)
7777
(ndk_path / "source.properties").write_text("Pkg.Revision = 26.1.10909125")
78-
78+
7979
version = self.resolver.get_version(ndk_path)
8080
assert version == "26.1.10909125"
8181

8282
def test_get_version_from_dir_name(self):
8383
"""Test getting version from directory name when source.properties missing."""
8484
ndk_path = self.sdk_root / "ndk" / "26.1.10909125"
8585
ndk_path.mkdir(parents=True)
86-
86+
8787
version = self.resolver.get_version(ndk_path)
8888
assert version == "26.1.10909125"
8989

9090
def test_get_version_unknown(self):
9191
"""Test getting version when unable to determine."""
9292
ndk_path = self.sdk_root / "ndk" / "unknown"
9393
ndk_path.mkdir(parents=True)
94-
94+
9595
version = self.resolver.get_version(ndk_path)
9696
assert version == "unknown"
9797

@@ -106,11 +106,11 @@ def test_install_ndk_fallback_to_download(self, mock_sdkmanager_class):
106106
mock_sdkmanager = Mock()
107107
mock_sdkmanager_class.return_value = mock_sdkmanager
108108
mock_sdkmanager.ensure_ndk.side_effect = Exception("sdkmanager failed")
109-
109+
110110
with patch.object(self.resolver, "_install_via_download") as mock_download:
111111
ndk_dir = self.sdk_root / "ndk" / "26.1.10909125"
112112
mock_download.return_value = ndk_dir
113-
113+
114114
result = self.resolver._install_ndk("r26d")
115115
assert result == ndk_dir
116116
mock_download.assert_called_once_with("r26d")
@@ -120,9 +120,10 @@ def test_resolve_path_with_ndk_home_env(self):
120120
ndk_path = self.sdk_root / "custom-ndk"
121121
ndk_path.mkdir()
122122
(ndk_path / "source.properties").write_text("Pkg.Revision = 26.1.10909125")
123-
123+
124124
with patch.dict("os.environ", {"NDK_HOME": str(ndk_path)}):
125125
from ovmobilebench.android.installer.types import NdkSpec
126+
126127
spec = NdkSpec(alias="r26d") # Provide required alias
127128
result = self.resolver.resolve_path(spec)
128129
assert result is not None
@@ -133,9 +134,10 @@ def test_resolve_path_with_android_ndk_env(self):
133134
ndk_path = self.sdk_root / "android-ndk"
134135
ndk_path.mkdir()
135136
(ndk_path / "source.properties").write_text("Pkg.Revision = 26.1.10909125")
136-
137+
137138
with patch.dict("os.environ", {"ANDROID_NDK": str(ndk_path)}):
138139
from ovmobilebench.android.installer.types import NdkSpec
140+
139141
spec = NdkSpec(alias="r26d") # Provide required alias
140142
result = self.resolver.resolve_path(spec)
141143
assert result is not None
@@ -145,6 +147,7 @@ def test_resolve_path_env_invalid(self):
145147
"""Test resolving path from environment with invalid path."""
146148
with patch.dict("os.environ", {"NDK_HOME": "/nonexistent/path"}):
147149
from ovmobilebench.android.installer.types import NdkSpec
150+
148151
spec = NdkSpec(alias="r26d") # Provide required alias
149152
result = self.resolver.resolve_path(spec)
150153
assert result is None
@@ -158,9 +161,9 @@ def test_list_installed_with_multiple_ndks(self):
158161
(ndk_path / "source.properties").write_text(f"Pkg.Revision = {version}")
159162
# Add ndk-build to make it valid
160163
(ndk_path / "ndk-build").touch()
161-
164+
162165
ndks = self.resolver.list_installed()
163166
assert len(ndks) == 3
164167
assert "25.2.9519653" in [n["version"] for n in ndks]
165168
assert "26.1.10909125" in [n["version"] for n in ndks]
166-
assert "27.0.11718014" in [n["version"] for n in ndks]
169+
assert "27.0.11718014" in [n["version"] for n in ndks]

0 commit comments

Comments
 (0)