Skip to content

Commit 3eb99d2

Browse files
[integ-tests] Skip Insufficient capacity error when checking logs for all tests
This commit will reduce intermittent test failures
1 parent 3c7be23 commit 3eb99d2

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

tests/integration-tests/benchmarks/test_scaling_performance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ def test_scaling_performance(
7272
)
7373
assert_that(max(compute_nodes_time_series)).is_equal_to(benchmark_params["scaling_target"])
7474
assert_that(compute_nodes_time_series[-1]).is_equal_to(0)
75-
assert_no_errors_in_logs(remote_command_executor, scheduler)
75+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)

tests/integration-tests/benchmarks/test_scheduler_performance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_scheduler_performance(
7676
assert_that(max(compute_nodes_time_series)).is_equal_to(benchmark_params["scaling_target"])
7777
assert_that(compute_nodes_time_series[-1]).is_equal_to(0)
7878
_assert_jobs_completed(remote_command_executor, benchmark_params["jobs_to_submit"])
79-
assert_no_errors_in_logs(remote_command_executor, scheduler)
79+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
8080

8181

8282
def _submit_jobs(benchmark_params, scheduler_commands, cluster, scheduler_commands_factory):

tests/integration-tests/tests/basic/test_essential_features.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,5 +356,5 @@ def _test_disable_hyperthreading(
356356
default_threads_per_core=default_threads_per_core,
357357
)
358358

359-
assert_no_errors_in_logs(remote_command_executor, scheduler)
359+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
360360
run_system_analyzer(cluster, scheduler_commands_factory, request)

tests/integration-tests/tests/cli_commands/test_cli_commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_slurm_cli_commands(
9797
_test_pcluster_compute_fleet(cluster, expected_num_nodes=2)
9898

9999
remote_command_executor = RemoteCommandExecutor(cluster)
100-
assert_no_errors_in_logs(remote_command_executor, scheduler)
100+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
101101

102102

103103
def _test_create_cluster(clusters_factory, cluster_config, request):

tests/integration-tests/tests/iam/test_iam.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def test_iam_policies(region, scheduler, pcluster_config_reader, clusters_factor
302302
if scheduler == "awsbatch":
303303
_test_batch_access(remote_command_executor, region)
304304

305-
assert_no_errors_in_logs(remote_command_executor, scheduler)
305+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
306306

307307

308308
def _test_s3_access(remote_command_executor, region):

tests/integration-tests/tests/intel_hpc/test_intel_hpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_intel_hpc(
3333
_test_intel_instance_tags(cluster.get_cluster_instance_ids(), region)
3434
_test_intel_clck(remote_command_executor, scheduler_commands, test_datadir)
3535

36-
assert_no_errors_in_logs(remote_command_executor, scheduler)
36+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
3737

3838

3939
def _test_intel_instance_tags(cluster_instances, region):

tests/integration-tests/tests/networking/test_cluster_networking.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def test_cluster_in_no_internet_subnet(
170170
_run_prolog_epilog_jobs(remote_command_executor, slurm_commands)
171171
_run_mpi_jobs(mpi_variants, remote_command_executor, test_datadir, slurm_commands, cluster, region)
172172
check_pcluster_list_cluster_log_streams(cluster, os)
173-
assert_no_errors_in_logs(remote_command_executor, scheduler)
173+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
174174
logging.info("Checking compute node is scaled down after scaledown idle time")
175175
wait_for_num_instances_in_cluster(cluster.cfn_name, region, 1)
176176

tests/integration-tests/tests/scaling/test_scaling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def _test_multiple_jobs(cluster, remote_command_executor, test_datadir, region,
281281
)
282282

283283
logging.info("Verifying no error in logs")
284-
assert_no_errors_in_logs(remote_command_executor, "slurm")
284+
assert_no_errors_in_logs(remote_command_executor, "slurm", skip_ice=True)
285285

286286

287287
@pytest.mark.usefixtures("os", "instance", "scheduler")

tests/integration-tests/tests/schedulers/test_slurm.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def test_slurm(
125125

126126
# Tests below must run on HeadNode or need HeadNode participate.
127127
head_node_command_executor = RemoteCommandExecutor(cluster)
128-
assert_no_errors_in_logs(head_node_command_executor, "slurm")
128+
assert_no_errors_in_logs(head_node_command_executor, "slurm", skip_ice=True)
129129
# Test compute node bootstrap timeout
130130
clustermgtd_conf_path = retrieve_clustermgtd_conf_path(head_node_command_executor)
131131
_test_compute_node_bootstrap_timeout(
@@ -244,7 +244,7 @@ def test_slurm_from_login_nodes_in_private_network(
244244
# Test torque command wrapper
245245
_test_torque_job_submit(remote_command_executor, test_datadir)
246246
head_node_command_executor = RemoteCommandExecutor(cluster)
247-
assert_no_errors_in_logs(head_node_command_executor, "slurm")
247+
assert_no_errors_in_logs(head_node_command_executor, "slurm", skip_ice=True)
248248

249249

250250
@pytest.mark.usefixtures("region", "os", "instance", "scheduler")
@@ -309,7 +309,7 @@ def test_slurm_scaling(
309309
dynamic_instance_type=instance,
310310
stop_max_delay_secs=stop_max_delay_secs,
311311
)
312-
assert_no_errors_in_logs(remote_command_executor, scheduler)
312+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
313313

314314

315315
@pytest.mark.usefixtures("os", "instance", "scheduler")
@@ -426,7 +426,7 @@ def test_error_handling(
426426
num_static_nodes=1,
427427
)
428428
# Next test will introduce error in logs, assert no error now
429-
assert_no_errors_in_logs(remote_command_executor, scheduler)
429+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
430430
_test_clustermgtd_down_logic(
431431
remote_command_executor,
432432
scheduler_commands,
@@ -1047,7 +1047,7 @@ def test_slurm_overrides(
10471047
)
10481048
assert_msg_in_log(remote_command_executor, slurm_resume_log, f"Found {api} parameters override")
10491049

1050-
assert_no_errors_in_logs(remote_command_executor, scheduler)
1050+
assert_no_errors_in_logs(remote_command_executor, scheduler, skip_ice=True)
10511051

10521052

10531053
def _assert_cluster_initial_conditions(

0 commit comments

Comments
 (0)