[diffoscope] 02/02: tests: test_fsimage: remove debugging messages, not available on jenkins

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository diffoscope.

commit e852dde5accae9dd669d18798ad468a72e72267c
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jul 11 17:18:00 2017 +0200

    tests: test_fsimage: remove debugging messages, not available on jenkins
---
 tests/comparators/test_fsimage.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/comparators/test_fsimage.py b/tests/comparators/test_fsimage.py
index 04700b1..ef5bd6c 100644
--- a/tests/comparators/test_fsimage.py
+++ b/tests/comparators/test_fsimage.py
@@ -39,16 +39,15 @@ def guestfs_tempdir():
         g.set_cachedir(cachedir)
         # set cachedir for the diffoscope.comparators.fsimage module as well
         os.environ["LIBGUESTFS_CACHEDIR"] = cachedir
-        # see what went wrong in jenkins
-        os.environ["LIBGUESTFS_DEBUG"] = "1"
-        os.environ["LIBGUESTFS_TRACE"] = "1"
         g.add_drive_opts("/dev/null", format="raw", readonly=1)
         try:
             g.launch()
-        except RuntimeError:
-            import traceback
-            traceback.print_exc()
-            pytest.skip('guestfs not working on the system')
+        except RuntimeError as e:
+            # to debug this, set LIBGUESTFS_DEBUG=1 and give -s to pytest.
+            # Unfortunately we can't capture the logs, due to capsys not being
+            # available in a module/session scope, and g.set_event_callback
+            # segfaults on my system.
+            pytest.skip('guestfs not working on the system: %r' % e)
         yield cachedir
 
 def test_identification(img1):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git