Skip to content

Commit a8f6af7

Browse files
committed
t1016: disable flakey tests
With the recent change to the way GNUPGHOME is set up, the compatObjectFormat tests started failing randomly in CI environments, and also under "t1016-compatObjectFormat.sh --stress". Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6cd8369 commit a8f6af7

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

t/t1016-compatObjectFormat.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,21 +261,21 @@ compare_oids () {
261261
compare_oids 'blob' hello "$hello_sha1_oid" "$hello_sha256_oid"
262262
compare_oids 'tree' tree "$tree_sha1_oid" "$tree_sha256_oid"
263263
compare_oids 'commit' commit "$commit_sha1_oid" "$commit_sha256_oid"
264-
compare_oids GPG2 'commit' signedcommit "$signedcommit_sha1_oid" "$signedcommit_sha256_oid"
264+
compare_oids GPG2,FLAKEY 'commit' signedcommit "$signedcommit_sha1_oid" "$signedcommit_sha256_oid"
265265
compare_oids 'tag' hellotag "$hellotag_sha1_oid" "$hellotag_sha256_oid"
266266
compare_oids 'tag' treetag "$treetag_sha1_oid" "$treetag_sha256_oid"
267267
compare_oids 'tag' committag "$committag_sha1_oid" "$committag_sha256_oid"
268-
compare_oids GPG2 'tag' signedtag "$signedtag_sha1_oid" "$signedtag_sha256_oid"
268+
compare_oids GPG2,FLAKEY 'tag' signedtag "$signedtag_sha1_oid" "$signedtag_sha256_oid"
269269

270270
compare_oids 'blob' more "$more_sha1_oid" "$more_sha256_oid"
271271
compare_oids 'blob' another "$another_sha1_oid" "$another_sha256_oid"
272272
compare_oids 'tree' tree2 "$tree2_sha1_oid" "$tree2_sha256_oid"
273273
compare_oids 'commit' commit2 "$commit2_sha1_oid" "$commit2_sha256_oid"
274-
compare_oids GPG2 'tag' signedtag2 "$signedtag2_sha1_oid" "$signedtag2_sha256_oid"
275-
compare_oids GPG2 'commit' signedcommit2 "$signedcommit2_sha1_oid" "$signedcommit2_sha256_oid"
276-
compare_oids GPG2 'commit' signedcommit3 "$signedcommit3_sha1_oid" "$signedcommit3_sha256_oid"
277-
compare_oids GPG2 'commit' signedcommit4 "$signedcommit4_sha1_oid" "$signedcommit4_sha256_oid"
278-
compare_oids GPG2 'tag' signedtag3 "$signedtag3_sha1_oid" "$signedtag3_sha256_oid"
279-
compare_oids GPG2 'tag' signedtag4 "$signedtag4_sha1_oid" "$signedtag4_sha256_oid"
274+
compare_oids GPG2,FLAKEY 'tag' signedtag2 "$signedtag2_sha1_oid" "$signedtag2_sha256_oid"
275+
compare_oids GPG2,FLAKEY 'commit' signedcommit2 "$signedcommit2_sha1_oid" "$signedcommit2_sha256_oid"
276+
compare_oids GPG2,FLAKEY 'commit' signedcommit3 "$signedcommit3_sha1_oid" "$signedcommit3_sha256_oid"
277+
compare_oids GPG2,FLAKEY 'commit' signedcommit4 "$signedcommit4_sha1_oid" "$signedcommit4_sha256_oid"
278+
compare_oids GPG2,FLAKEY 'tag' signedtag3 "$signedtag3_sha1_oid" "$signedtag3_sha256_oid"
279+
compare_oids GPG2,FLAKEY 'tag' signedtag4 "$signedtag4_sha1_oid" "$signedtag4_sha256_oid"
280280

281281
test_done

0 commit comments

Comments
 (0)