Merge pull request #1245 from RcppCore/feature/silence_test

eddelbuettel · web-flow · commit 8d82ab9f66d3 · 2023-01-29T12:08:13.000-06:00
Condition one test with stdout on verbose test var
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2023-01-29  Iñaki Ucar  <iucar@fedoraproject.org>
+
+	* inst/tinytest/test_xptr.R: Fix a couple of tests writing to stdout
+
 2023-01-24  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version, Date): Roll minor version
diff --git a/inst/tinytest/test_xptr.R b/inst/tinytest/test_xptr.R
@@ -60,9 +60,9 @@ void test() {
 '
 
 writeLines(code, file_path)
-expect_silent(system(cmd), info="check that finalizer is NOT called on exit")
+expect_equal(system(cmd, intern=TRUE), character(0))
 
 if (packageVersion("tinytest") < "1.2.0") exit_file("Skip remainder on older test platform")
 
 writeLines(c("#define RCPP_USE_FINALIZE_ON_EXIT", code), file_path)
-expect_stdout(system(cmd), info="check that finalizer is called on exit")
+expect_equal(system(cmd, intern=TRUE), "custom_finalizer was called")

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +2023-01-29  Iñaki Ucar  <[email protected]>
++
 +	* inst/tinytest/test_xptr.R: Fix a couple of tests writing to stdout
++
 -01-24  Dirk Eddelbuettel  <[email protected]>
 	* DESCRIPTION (Version, Date): Roll minor version
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ void test() {`
`60`	`60`	`'`
`61`	`61`
`62`	`62`	`writeLines(code, file_path)`
`63`		`-expect_silent(system(cmd), info="check that finalizer is NOT called on exit")`
	`63`	`+expect_equal(system(cmd, intern=TRUE), character(0))`
`64`	`64`
`65`	`65`	`if (packageVersion("tinytest") < "1.2.0") exit_file("Skip remainder on older test platform")`
`66`	`66`
`67`	`67`	`writeLines(c("#define RCPP_USE_FINALIZE_ON_EXIT", code), file_path)`
`68`		`-expect_stdout(system(cmd), info="check that finalizer is called on exit")`
	`68`	`+expect_equal(system(cmd, intern=TRUE), "custom_finalizer was called")`