Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 026d0c8ae569
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 39c585aab14f
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Sep 17, 2018

  1. ostree: fix tests 

    - Workarounds for ostreedev/ostree#1592
- Disable failing test-gpg-verify-result.test, see
  ostreedev/ostree#1634

(cherry picked from commit d734328)
    @xeji
    xeji committed Sep 17, 2018
    Copy the full SHA
    39c585a View commit details
Showing with 116 additions and 0 deletions.
  1. +7 −0 pkgs/tools/misc/ostree/default.nix
  2. +12 −0 pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
  3. +97 −0 pkgs/tools/misc/ostree/fix-1592.patch
7 changes: 7 additions & 0 deletions pkgs/tools/misc/ostree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,11 @@ in stdenv.mkDerivation {
};

patches = [
# Workarounds for https://github.com/ostreedev/ostree/issues/1592
./fix-1592.patch
# Disable test-gpg-verify-result.test,
# https://github.com/ostreedev/ostree/issues/1634
./disable-test-gpg-verify-result.patch
# Tests access the helper using relative path
# https://github.com/ostreedev/ostree/issues/1593
(fetchpatch {
@@ -58,6 +63,7 @@ in stdenv.mkDerivation {
cp --no-preserve=mode -r ${bsdiff-src} bsdiff
'';


preConfigure = ''
env NOCONFIGURE=1 ./autogen.sh
'';
@@ -73,6 +79,7 @@ in stdenv.mkDerivation {
"installed_test_metadir=$(installedTests)/share/installed-tests/libostree"
];


meta = with stdenv.lib; {
description = "Git for operating system binaries";
homepage = https://ostree.readthedocs.io/en/latest/;
12 changes: 12 additions & 0 deletions pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am
--- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100
+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200
@@ -243,7 +243,7 @@

_installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
+ tests/test-checksum tests/test-lzma tests/test-rollsum \
tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h

if USE_AVAHI
97 changes: 97 additions & 0 deletions pkgs/tools/misc/ostree/fix-1592.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
--- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100
+++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200
@@ -275,7 +275,7 @@
if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
fatal "pull with mixed refs succeeded?"
fi
-assert_file_has_content err.txt "error: Invalid ref name origin:main"
+assert_file_has_content err.txt "Invalid ref name origin:main"
${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch
${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch
${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck
@@ -286,7 +286,7 @@
fatal "pulled nonexistent branch"
fi
# So true
-assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found"
+assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found"
echo "ok pull-local nonexistent branch"

cd ${test_tmpdir}
@@ -587,5 +587,5 @@
if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
fatal "pull of invalid ref succeeded"
fi
-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
echo "ok pull got HTML for a ref"
diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
--- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100
+++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200
@@ -100,7 +100,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
assert_file_has_content fsck "^Validating refs...$"

echo "ok 3 fsck detects missing ref bindings"
@@ -113,7 +113,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs in collections...$"

@@ -127,7 +127,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’"
+assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2."
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs in collections...$"

@@ -147,7 +147,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist"
+assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist'
assert_file_has_content fsck "^Validating refs...$"
assert_file_has_content fsck "^Validating refs in collections...$"

@@ -186,7 +186,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)"
assert_file_has_content fsck "^Validating refs...$"

echo "ok 9 fsck detects missing ref bindings"
@@ -205,7 +205,7 @@
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist"
+assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist'
assert_file_has_content fsck "^Validating refs...$"

echo "ok 11 fsck ignores unreferenced ref bindings"
diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh
--- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100
+++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200
@@ -83,7 +83,7 @@
if $OSTREE remote delete nosuchremote 2>err.txt; then
assert_not_reached "Deleting remote unexpectedly succeeded"
fi
-assert_file_has_content err.txt "error: "
+assert_file_has_content err.txt "not found"

$OSTREE remote delete --if-exists nosuchremote
echo "ok"