pkgs/tools/misc/ostree/fix-1592.patch

   1 diff --git a/tests/pull-test.sh b/tests/pull-test.sh
   2 index a8bc49a9..4a08ebb5 100644
   3 --- a/tests/pull-test.sh
   4 +++ b/tests/pull-test.sh
   5 @@ -275,7 +275,7 @@
   6  if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
   7      fatal "pull with mixed refs succeeded?"
   8  fi
   9 -assert_file_has_content err.txt "error: Invalid ref name origin:main"
  10 +assert_file_has_content err.txt "Invalid ref name origin:main"
  11  ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch
  12  ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch
  13  ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck
  14 @@ -286,7 +286,7 @@
  15      fatal "pulled nonexistent branch"
  16  fi
  17  # So true
  18 -assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found"
  19 +assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found"
  20  echo "ok pull-local nonexistent branch"
  21
  22  cd ${test_tmpdir}
  23 @@ -593,5 +593,5 @@
  24  if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
  25      fatal "pull of invalid ref succeeded"
  26  fi
  27 -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'
  28 +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'
  29  echo "ok pull got HTML for a ref"
  30 diff --git a/tests/test-config.sh b/tests/test-config.sh
  31 index 7e913d32..69d1675d 100755
  32 --- a/tests/test-config.sh
  33 +++ b/tests/test-config.sh
  34 @@ -46,7 +46,7 @@
  35  if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then
  36      assert_not_reached "ostree config get should error out if too many arguments are given"
  37  fi
  38 -assert_file_has_content err.txt "error: Too many arguments given"
  39 +assert_file_has_content err.txt "Too many arguments given"
  40  echo "ok config get"
  41
  42  ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only
  43 @@ -63,7 +63,7 @@
  44  if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then
  45      assert_not_reached "ostree config set should error out if too many arguments are given"
  46  fi
  47 -assert_file_has_content err.txt "error: Too many arguments given"
  48 +assert_file_has_content err.txt "Too many arguments given"
  49  echo "ok config set"
  50
  51  # Check that "ostree config unset" works
  52 @@ -78,7 +78,7 @@
  53  fi
  54  # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
  55  # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
  56 -assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core."
  57 +assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core."
  58
  59  # Check that it's idempotent
  60  ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs
  61 @@ -95,5 +95,5 @@
  62  if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then
  63      assert_not_reached "ostree config unset should error out if too many arguments are given"
  64  fi
  65 -assert_file_has_content err.txt "error: Too many arguments given"
  66 +assert_file_has_content err.txt "Too many arguments given"
  67  echo "ok config unset"
  68 diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
  69 index dc6bcfeb..4a5eef55 100755
  70 --- a/tests/test-fsck-collections.sh
  71 +++ b/tests/test-fsck-collections.sh
  72 @@ -100,7 +100,7 @@
  73  if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
  74      assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
  75  fi
  76 -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
  77 +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
  78  assert_file_has_content fsck "^Validating refs\.\.\.$"
  79
  80  echo "ok 3 fsck detects missing ref bindings"
  81 @@ -113,7 +113,7 @@
  82  if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
  83      assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
  84  fi
  85 -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
  86 +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
  87  assert_file_has_content fsck "^Validating refs\.\.\.$"
  88  assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
  89
  90 @@ -127,7 +127,7 @@
  91  if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
  92      assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
  93  fi
  94 -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’"
  95 +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."
  96  assert_file_has_content fsck "^Validating refs\.\.\.$"
  97  assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
  98
  99 @@ -147,7 +147,7 @@
 100  if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
 101      assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
 102  fi
 103 -assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist"
 104 +assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist'
 105  assert_file_has_content fsck "^Validating refs\.\.\.$"
 106  assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
 107
 108 @@ -186,7 +186,7 @@
 109  if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
 110      assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
 111  fi
 112 -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)"
 113 +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)"
 114  assert_file_has_content fsck "^Validating refs\.\.\.$"
 115
 116  echo "ok 9 fsck detects missing ref bindings"
 117 @@ -205,7 +205,7 @@
 118  if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
 119      assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
 120  fi
 121 -assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist"
 122 +assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist'
 123  assert_file_has_content fsck "^Validating refs\.\.\.$"
 124
 125  echo "ok 11 fsck ignores unreferenced ref bindings"
 126 diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
 127 index bb7eae89..62a3bcd7 100755
 128 --- a/tests/test-remote-add.sh
 129 +++ b/tests/test-remote-add.sh
 130 @@ -83,7 +83,7 @@
 131  if $OSTREE remote delete nosuchremote 2>err.txt; then
 132      assert_not_reached "Deleting remote unexpectedly succeeded"
 133  fi
 134 -assert_file_has_content err.txt "error: "
 135 +assert_file_has_content err.txt "not found"
 136
 137  $OSTREE remote delete --if-exists nosuchremote
 138  echo "ok"