diffoscope: add missing tools #89195
Conversation
danielfullmer
force-pushed
the
diffoscope-tools
branch
from
09e31d4
to
21a744e
Compare
There was a problem hiding this comment.
Tests are failing for me like this:
diffoscope> =================================== FAILURES ===================================
diffoscope> _________________________________ test_content _________________________________
diffoscope> differences = [<Difference dir -- dir [<Difference stat {} -- stat {} []>, <Difference text -- text [<Difference stat {} -- stat {} []>]>, <Difference stat {} -- stat {} []>]>]
diffoscope> def test_content(differences):
diffoscope> assert differences[0].source1 == 'dir'
diffoscope> > assert differences[0].details[0].source1 == 'text'
diffoscope> E AssertionError: assert 'stat {}' == 'text'
diffoscope> E - stat {}
diffoscope> E + text
diffoscope> tests/comparators/test_directory.py:71: AssertionError
diffoscope> ============= 1 failed, 344 passed, 98 skipped in 83.97s (0:01:23) =============
diffoscope> builder for '/nix/store/7gnvgnbj2qs3k2792x69k9fss6f4jv2i-diffoscope-144.drv' failed with exit code 1
|
@Ma27 Hmm, that's strange. It is working for me, and I haven't been able to reproduce. It also seems to be working on the OfBorg builder: https://github.com/NixOS/nixpkgs/pull/89195/checks?check_run_id=722214621 What filesystem are you using? I've tried this on two different machines, using |
|
That's interesting. It builds fine on my local machine (NixOS 20.03, Linux 5.6.14, ZFS) and breaks on my remote builder (NixOS 20.03, Linux 5.6.14, ext4 in a KVM). Unless we find the culprit, I'd suggest to skip the flaky test. |
|
I was able to reproduce this in a VM with ext4. It turns out this issue was fixed in the most recent version of diffoscope: So, I added a commit bumping to (edit: Whoops, it looks like you beat me to it!) |
danielfullmer
force-pushed
the
diffoscope-tools
branch
from
bdc5971
to
e3f3d14
Compare
|
Rebased commit against master. I also had to add However, now that I've rebased against master, an indirect dependency is failing to build for me: |
|
@danielfullmer please rebase onto latest master, |
`nix path-info -S` reports the following changes: diffoscope: 345M -> 356.7M diffoscope w/ enableBloat: 5.4G -> 6.1G Also re-enabled the tests and added the dependencies to checkInputs so the comparator tests are not automatically skipped.
danielfullmer
force-pushed
the
diffoscope-tools
branch
from
e3f3d14
to
8214b8b
Compare
|
Rebased against master, successfully built and briefly tested with and without |
Motivation for this change
Add a bunch of dependencies for missing tools.
nix path-info -Sreports the following changes:diffoscope: 345M -> 356.7M
diffoscope w/ enableBloat: 5.4G -> 6.1G
Also re-enabled the tests and added the dependencies to checkInputs so
the comparator tests are not automatically skipped.
CC @dezgeg @Ma27
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)