From 47d39d1efa212fb1fc1da91b8393348c4726f187 Mon Sep 17 00:00:00 2001
From: Ming-Hung Tsai <mtsai@redhat.com>
Date: Mon, 30 Aug 2021 16:19:54 +0800
Subject: [PATCH] [tests] Do not assume no stderr with thin_dump

---
 tests/thin_dump.rs   | 9 +++++++--
 tests/thin_repair.rs | 8 ++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/thin_dump.rs b/tests/thin_dump.rs
index 8e17e19..c1bd3c4 100644
--- a/tests/thin_dump.rs
+++ b/tests/thin_dump.rs
@@ -114,6 +114,7 @@ fn dump_restore_cycle() -> Result<()> {
 // test no stderr with a normal dump
 
 #[test]
+#[cfg(not(feature = "rust_tests"))]
 fn no_stderr() -> Result<()> {
     let mut td = TestDir::new()?;
 
@@ -133,7 +134,9 @@ fn override_something(flag: &str, value: &str, pattern: &str) -> Result<()> {
     let md = mk_valid_md(&mut td)?;
     let output = run_ok_raw(THIN_DUMP, args![&md, flag, value])?;
 
-    assert_eq!(output.stderr.len(), 0);
+    if !cfg!(feature = "rust_tests") {
+        assert_eq!(output.stderr.len(), 0);
+    }
     assert!(from_utf8(&output.stdout[0..])?.contains(pattern));
     Ok(())
 }
@@ -179,7 +182,9 @@ fn repair_superblock() -> Result<()> {
             &md
         ],
     )?;
-    assert_eq!(after.stderr.len(), 0);
+    if !cfg!(feature = "rust_tests") {
+        assert_eq!(after.stderr.len(), 0);
+    }
     assert_eq!(before.stdout, after.stdout);
 
     Ok(())
diff --git a/tests/thin_repair.rs b/tests/thin_repair.rs
index 19e4865..3a37846 100644
--- a/tests/thin_repair.rs
+++ b/tests/thin_repair.rs
@@ -148,7 +148,9 @@ fn superblock_succeeds() -> Result<()> {
             &md1
         ],
     )?;
-    assert_eq!(original.stderr.len(), 0);
+    if !cfg!(feature = "rust_tests") {
+        assert_eq!(original.stderr.len(), 0);
+    }
     damage_superblock(&md1)?;
     let md2 = mk_zeroed_md(&mut td)?;
     run_ok(
@@ -164,7 +166,9 @@ fn superblock_succeeds() -> Result<()> {
         ],
     )?;
     let repaired = run_ok_raw(THIN_DUMP, args![&md2])?;
-    assert_eq!(repaired.stderr.len(), 0);
+    if !cfg!(feature = "rust_tests") {
+        assert_eq!(repaired.stderr.len(), 0);
+    }
     assert_eq!(original.stdout, repaired.stdout);
     Ok(())
 }