Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pgpdump: 0.33 -> 0.34 #149700

Merged
merged 1 commit into from
Dec 10, 2021
Merged

pgpdump: 0.33 -> 0.34 #149700

merged 1 commit into from
Dec 10, 2021

Conversation

primeos
Copy link
Member

@primeos primeos commented Dec 8, 2021

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi
Copy link
Contributor

trofi commented Dec 11, 2021

Looks like this change broke diffoscope testsuite: https://hydra.nixos.org/build/161184989

signed_differences = [<Difference pgpdump -- pgpdump []>, <Difference test1.tar -- test2.tar [<Difference file list -- file list []>, <Difference dir/text -- dir/text []>, <Difference dir/link -- dir/link []>]>]

    @skip_unless_tools_exist("pgpdump")
    def test_signed_diff(signed_differences):
>       assert_diff(signed_differences[0], "pgp_signed_expected_diff")

tests/comparators/test_pgp.py:84: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

difference = <Difference pgpdump -- pgpdump []>
filename = 'pgp_signed_expected_diff'

    def assert_diff(difference, filename):
        # Assign seen and expected values to local variables to improve contextual
        # information in failed tests.
        seen = difference.unified_diff
        expected = get_data(filename)
>       assert seen == expected
E       AssertionError

tests/utils/data.py:64: AssertionError

Bisect points at pgpdump: 0.33 -> 0.34, 816d311

primeos added a commit to primeos/nixpkgs that referenced this pull request Dec 11, 2021
This fixes a regression from the last pgpdump update: 816d311
See NixOS#149700 (comment)

Reported-by: Sergei Trofimovich <slyich@gmail.com>
@primeos
Copy link
Member Author

primeos commented Dec 11, 2021

Thanks @trofi. I've fixed the test in #150243.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants