[diffoscope] Test failures without "tlsh" module

[Mattia Rizzolo]

Hi,

On Wed, Jun 10, 2020 at 11:57:21AM +0200, Fabian Keil wrote:
> I submitted a diffoscope update to 146 for FreeBSD and it was pointed
> out by Kubilay Kocak that there are lots of errors during make test:
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246773#c2
> 
> I could reproduce this and as noted by Kubilay, most of
> them are caused by the no-tlsh-module warning which the
> tests don't seem to expect.

For these, could you please try the following diff?

diff --git a/diffoscope/main.py b/diffoscope/main.py
index 4202fc9..5205772 100644
--- a/diffoscope/main.py
+++ b/diffoscope/main.py
@@ -658,7 +658,7 @@ def run_diffoscope(parsed_args):

     ProfileManager().setup(parsed_args)
     PresenterManager().configure(parsed_args)
-    if not tlsh:
+    if not tlsh and "PYTEST_CURRENT_TEST" not in os.environ:
         logger.warning(
             'Fuzzy-matching is currently disabled as the "tlsh" module is unavailable.'
         )


> Note that there are also "list index out of range" errors
> which may be unrelated:

These are more problematic, and might require some real debugging
though…

> Is the missing "tlsh" module really important enough to
> show the warning every time diffoscope is executed?

well, it might not be…
It was changed more than a year ago, after somebody requested it…
https://salsa.debian.org/reproducible-builds/diffoscope/commit/292895cad5c5304cb865f69e980e4edccca2cf0e

But I can tell you that in my experience the lack of fuzzy matching does
degrate the experience quite a lot.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
More about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.reproducible-builds.org/pipermail/diffoscope/attachments/20200610/5e7b0635/attachment.sig>