- another fix for tests

CeMOS-Mannheim · Aug 11, 2024 · a70a574 · a70a574
1 parent e45d332
commit a70a574
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/testdata_bruker.zip b/testdata_bruker.zip
diff --git a/tests/testthat/test_1loadData_mzML.R b/tests/testthat/test_1loadData_mzML.R
@@ -29,19 +29,17 @@ test_that("data can be loaded and processed from mzML",
             app <- AppDriver$new(app_dir = getwd(),
                                  name = "M2ara_mzML load test",
                                  seed = 42,
-                                 timeout = 4000,
+                                 timeout = 10000,
                                  load_timeout = 30*1000)
 
 
             app$wait_for_idle()
             cat(timeNow(), "App started. Loading data...\n")
             app$click("load")
-            Sys.sleep(90)
-            app$wait_for_idle()
+            app$wait_for_idle(timeout = 300*1000)
             cat(timeNow(), "Start processing...\n")
             app$click("process")
-            Sys.sleep(90)
-            app$wait_for_idle()
+            app$wait_for_idle(timeout = 300*1000)
             cat(timeNow(), "Processing done.\n")
 
             app$click("doPca")

diff --git a/tests/testthat/test_loadData_bruker.R b/tests/testthat/test_loadData_bruker.R
@@ -31,16 +31,12 @@ test_that("data can be loaded and processed from Bruker Flex",
             app <- AppDriver$new(app_dir = getwd(),
                                  name = "M2ara_bruker load test",
                                  seed = 42,
-                                 timeout = 4000)
-
-            app$wait_for_idle()
-
-            app$get_logs()
+                                 timeout = 10000)
 
             app$click("load")
-            Sys.sleep(120)
+            app$wait_for_idle(timeout = 300*1000)
             app$click("process")
-            Sys.sleep(120)
+            app$wait_for_idle(timeout = 300*1000)
             exp <-app$get_values(export = TRUE)
 
             expect_equal(exp$export$isSpectrumList, TRUE)