Merge branch 'main' into mishushakov/skip-install-tests

Author: mishushakov

packages/js-sdk/tests/sandbox/metrics.test.ts

@@ -3,26 +3,30 @@ import { expect } from 'vitest'
 import { SandboxMetrics } from '../../src'
 import { sandboxTest, isDebug, wait } from '../setup.js'
 
-sandboxTest.skipIf(isDebug)('sbx metrics', async ({ sandbox }) => {
-  const now = new Date()
-  let metrics: SandboxMetrics[]
-  for (let i = 0; i < 15; i++) {
-    metrics = await sandbox.getMetrics()
-    if (metrics.length > 0) {
-      break
+sandboxTest.skipIf(isDebug)(
+  'sbx metrics',
+  { timeout: 60_000 },
+  async ({ sandbox }) => {
+    const now = new Date()
+    let metrics: SandboxMetrics[]
+    for (let i = 0; i < 60; i++) {
+      metrics = await sandbox.getMetrics()
+      if (metrics.length > 0) {
+        break
+      }
+      await wait(500)
     }
-    await wait(1_000)
-  }
 
-  expect(metrics.length).toBeGreaterThan(0)
-  const metric = metrics[0]
-  expect(metric.diskTotal).toBeDefined()
-  expect(metric.diskUsed).toBeDefined()
-  expect(metric.memTotal).toBeDefined()
-  expect(metric.memUsed).toBeDefined()
-  expect(metric.cpuUsedPct).toBeDefined()
-  expect(metric.cpuCount).toBeDefined()
+    expect(metrics.length).toBeGreaterThan(0)
+    const metric = metrics[0]
+    expect(metric.diskTotal).toBeDefined()
+    expect(metric.diskUsed).toBeDefined()
+    expect(metric.memTotal).toBeDefined()
+    expect(metric.memUsed).toBeDefined()
+    expect(metric.cpuUsedPct).toBeDefined()
+    expect(metric.cpuCount).toBeDefined()
 
-  metrics = await sandbox.getMetrics({ start: now, end: new Date() })
-  expect(metrics.length).toBeGreaterThan(0)
-})
+    metrics = await sandbox.getMetrics({ start: now, end: new Date() })
+    expect(metrics.length).toBeGreaterThan(0)
+  }
+)

packages/python-sdk/tests/async/sandbox_async/test_metrics.py

@@ -5,17 +5,18 @@
 
 
 @pytest.mark.skip_debug()
+@pytest.mark.timeout(60)
 async def test_sbx_metrics(async_sandbox_factory):
     start_time = datetime.datetime.now()
-    sbx = await async_sandbox_factory(timeout=20)
+    sbx = await async_sandbox_factory(timeout=60)
 
     # Wait for the sandbox to have some metrics
     metrics = []
-    for _ in range(15):
+    for _ in range(60):
         metrics = await sbx.get_metrics()
         if len(metrics) > 0:
             break
-        await asyncio.sleep(1)
+        await asyncio.sleep(0.5)
 
     assert len(metrics) > 0
 

packages/python-sdk/tests/sync/sandbox_sync/test_metrics.py

@@ -5,16 +5,17 @@
 
 
 @pytest.mark.skip_debug()
+@pytest.mark.timeout(60)
 def test_sbx_metrics(sandbox_factory) -> None:
     start_time = datetime.datetime.now()
     sbx = sandbox_factory(timeout=60)
     # Wait for the sandbox to have some metrics
     metrics = []
-    for _ in range(15):
+    for _ in range(60):
         metrics = sbx.get_metrics()
         if len(metrics) > 0:
             break
-        time.sleep(1)
+        time.sleep(0.5)
 
     assert len(metrics) > 0