update test

Author: zhenyu-ms

tests/unit/testplan/common/entity/test_environment.py

@@ -1,9 +1,18 @@
 import multiprocessing.pool as mp
+import os
+import sys
 import time
-from testplan.common.entity.base import Resource, Environment
 
 import pytest
 
+from testplan.common.entity.base import Environment, Resource
+
+# Python 3.13+ uses process_cpu_count() for ThreadPool sizing
+if sys.version_info >= (3, 13):
+    CPU_COUNT = os.process_cpu_count()
+else:
+    CPU_COUNT = os.cpu_count()
+
 
 @pytest.fixture
 def environment():
@@ -73,15 +82,17 @@ def test_basic(self, environment, pool, mocker):
         environment.start_in_pool(pool)
         b = time.time()
 
-        assert b - a < 2, "resources didn't start concurrently"
+        if CPU_COUNT and CPU_COUNT >= 2:
+            assert b - a < 2, "resources didn't start concurrently"
         assert pre.call_count == 2, "pre-hooks not invoked"
         assert post.call_count == 2, "post-hooks not invoked"
 
         c = time.time()
         environment.stop_in_pool(pool)
         d = time.time()
 
-        assert d - c < 2, "resources didn't stop concurrently"
+        if CPU_COUNT and CPU_COUNT >= 2:
+            assert d - c < 2, "resources didn't stop concurrently"
         assert pre.call_count == 4, "pre-hooks not invoked"
         assert post.call_count == 4, "post-hooks not invoked"
 
@@ -108,7 +119,8 @@ def test_long_pre(self, environment, pool, mocker):
         b = time.time()
         environment.stop_in_pool(pool)
 
-        assert b - a < 3, "resources didn't start concurrently"
+        if CPU_COUNT and CPU_COUNT >= 2:
+            assert b - a < 3, "resources didn't start concurrently"
         assert wait.call_count == 2, "wait-hooks not invoked"
         assert post.call_count == 2, "post-hooks not invoked"
 
@@ -135,7 +147,8 @@ def test_long_post(self, environment, pool, mocker):
         environment.stop_in_pool(pool)
         b = time.time()
 
-        assert b - a < 3, "resources didn't stop concurrently"
+        if CPU_COUNT and CPU_COUNT >= 2:
+            assert b - a < 3, "resources didn't stop concurrently"
         assert wait.call_count == 2, "wait-hooks not invoked"
         assert pre.call_count == 2, "pre-hooks not invoked"
 
@@ -164,7 +177,8 @@ def test_manual_resource(self, environment, pool, mocker):
         a = time.time()
         environment.start_in_pool(pool)
         b = time.time()
-        assert b - a < 2, "resources didn't start concurrently"
+        if CPU_COUNT and CPU_COUNT >= 2:
+            assert b - a < 2, "resources didn't start concurrently"
         assert not len(environment.start_exceptions)
 
         m.start()
@@ -201,7 +215,7 @@ def test_op_timeout(self, environment, pool, mocker):
 
     def test_nested_pool(self, environment, pool, mocker):
         wait, post = mocker.Mock(), mocker.Mock()
-        with mp.ThreadPool() as pool:
+        with mp.ThreadPool() as another_pool:
 
             def _nested(_):
                 environment.add(
@@ -223,9 +237,10 @@ def _nested(_):
                 environment.stop_in_pool(pool)
                 b = time.time()
 
-                assert b - a < 2, "resources didn't start concurrently"
+                if CPU_COUNT and CPU_COUNT >= 4:
+                    assert b - a < 4, "resources didn't start concurrently"
 
-            r = pool.map_async(
+            r = another_pool.map_async(
                 _nested,
                 [None, None],
             )