Skip to content

Commit 89ef497

Browse files
committed
Rename the option to --generate-emulators
1 parent c9c80e9 commit 89ef497

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

.github/workflows/integration_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
export PATH=`pwd`/flutter-tizen/bin:$PATH
2525
./tools/run_command.py test \
2626
--recipe ./tools/recipe.yaml \
27-
--use-ephemeral-targets \
27+
--generate-emulators \
2828
--run-on-changed-packages \
2929
--base-sha=$(git rev-parse HEAD^) \
3030
--exclude wearable_rotary image_picker camera webview_flutter \

tools/commands/integration_test.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ def run_integration_test(self, plugin_name, directory, timeout):
130130
])
131131

132132

133-
class EphemeralTarget(Target):
134-
"""A Tizen emulator that launches/poweroffs itself during test."""
133+
class TemporaryEmulator(Target):
134+
"""A Tizen emulator that is created temporary by the tool for testing purposes."""
135135

136136
def __init__(self, name, platform):
137137
super().__init__(name, platform)
@@ -289,31 +289,31 @@ def _parse_target_info(self, capability_info):
289289
return device_profile, tizen_version
290290

291291

292-
class EphemeralTargetManager(TargetManager):
293-
"""A TargetManager for EphemeralTargets."""
292+
class TemporaryEmulatorManager(TargetManager):
293+
"""A TargetManager for TemporaryEmulators."""
294294

295295
def __init__(self, platforms):
296296
super().__init__()
297297
self.platforms = platforms
298298

299299
def __enter__(self):
300300
for platform in self.platforms:
301-
self._create_ephemeral_target(platform)
301+
self._create_emulator(platform)
302302
return self
303303

304304
def __exit__(self, exc_type, exc_value, traceback):
305-
self._delete_ephemeral_targets()
305+
self._delete_emulators()
306306
super().__exit__(exc_type, exc_value, traceback)
307307

308-
def _create_ephemeral_target(self, platform):
308+
def _create_emulator(self, platform):
309309
device_profile, tizen_version = platform.split('-', 1)
310310
# Target name valid characters are [A-Za-z0-9-_].
311-
target_name = f'{device_profile}-{tizen_version.replace(".", "_")}-{os.getpid()}'
312-
target = EphemeralTarget(target_name, platform)
313-
target.create()
314-
self.targets_per_platform[platform].append(target)
311+
emulator_name = f'{device_profile}-{tizen_version.replace(".", "_")}-{os.getpid()}'
312+
emulator = TemporaryEmulator(emulator_name, platform)
313+
emulator.create()
314+
self.targets_per_platform[platform].append(emulator)
315315

316-
def _delete_ephemeral_targets(self):
316+
def _delete_emulators(self):
317317
for targets in self.targets_per_platform.values():
318318
for target in targets:
319319
target.delete()
@@ -384,23 +384,23 @@ def set_subparser(subparsers):
384384
c: [wearable-4.0]
385385
)''')
386386
parser.add_argument(
387-
'--use-ephemeral-targets',
387+
'--generate-emulators',
388388
default=False,
389389
action='store_true',
390-
help='''Create and destroy ephemeral targets during test.
391-
Must provide --platforms or --recipe option to specify which
392-
platform targets to create.''')
390+
help='''Create and destroy emulators during test.
391+
Must provide either --platforms or --recipe option to specify which
392+
platforms to create.''')
393393
parser.set_defaults(func=run_integration_test)
394394

395395

396-
def _get_target_manager(use_ephemeral_targets, platforms):
397-
if use_ephemeral_targets:
398-
return EphemeralTargetManager(platforms)
396+
def _get_target_manager(generate_emulators, platforms):
397+
if generate_emulators:
398+
return TemporaryEmulatorManager(platforms)
399399
else:
400400
return TargetManager()
401401

402402

403-
def _integration_test(plugin_dir, platforms, timeout, use_ephemeral_targets):
403+
def _integration_test(plugin_dir, platforms, timeout, generate_emulators):
404404
"""Runs integration test in the example package for plugin_dir
405405
406406
Currently the tools assumes that there's only one example package per plugin.
@@ -409,7 +409,7 @@ def _integration_test(plugin_dir, platforms, timeout, use_ephemeral_targets):
409409
plugin_dir (str): The path to a single plugin directory.
410410
platforms (List[str]): A list of testing platforms.
411411
timeout (int): Time limit in seconds before cancelling the test.
412-
use_ephemeral_targets (bool): Whether to create and delete targets
412+
generate_emulators (bool): Whether to create and delete targets
413413
for test.
414414
415415
Returns:
@@ -450,7 +450,7 @@ def _integration_test(plugin_dir, platforms, timeout, use_ephemeral_targets):
450450

451451
try:
452452
with _get_target_manager(
453-
use_ephemeral_targets,
453+
generate_emulators,
454454
platforms,
455455
) as target_manager:
456456
if not platforms:
@@ -521,9 +521,9 @@ def run_integration_test(args):
521521
)
522522
exit(1)
523523

524-
if args.use_ephemeral_targets and not args.platforms and not args.recipe:
524+
if args.generate_emulators and not args.platforms and not args.recipe:
525525
print(
526-
'--use-ephemeral-targets option must be used with either --platforms or --recipe option.'
526+
'--generate-emulators option must be used with either --platforms or --recipe option.'
527527
)
528528
exit(1)
529529

@@ -552,7 +552,7 @@ def run_integration_test(args):
552552
os.path.join(packages_dir, testing_plugin),
553553
platforms,
554554
args.timeout,
555-
args.use_ephemeral_targets,
555+
args.generate_emulators,
556556
))
557557

558558
print(f'============= TEST RESULT =============')

0 commit comments

Comments
 (0)