Skip to content

Commit 84cd6f8

Browse files
Clara Rullfacebook-github-bot
authored andcommitted
Sort scuba output
Summary: This test is flaky due to the ordering of the scuba samples, fix it by sorting after extracting the fields instead of before See https://www.internalfb.com/intern/test/844425124600074?ref_report_id=0 Reviewed By: RajivTS Differential Revision: D67977496 fbshipit-source-id: 38c7325fb4b134f9f74847ede3041aaecb6a3063
1 parent 8913d6f commit 84cd6f8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

eden/mononoke/tests/integration/mononoke_git_server/test-mononoke-git-server-push-with-scuba.t

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
$ echo "this is file1" > file1
2121
$ git add file1
2222
$ git commit -qam "Add file1"
23-
# Create a tag pointing to the first commit
23+
# Create a tag pointing to the first commit
2424
$ git tag -a -m "new tag" first_tag
2525
$ current_first_tag=$(git rev-parse HEAD)
2626
$ echo "this is file2" > file2
@@ -78,18 +78,18 @@
7878
$ wait_for_git_bookmark_create refs/tags/past_tag
7979

8080
# Verify the timed futures logged with log tags show up in scuba logs
81-
$ jq -S .normal "$SCUBA" | grep -e "Packfile" -e "GitImport" -e "Bookmark movement" -e "Prerequisite" -e "Objects" -e "Prefetched" -e "Content Blob" -e "Bonsai Changeset" -e "Finalize Batch"
82-
"log_tag": "Verified Packfile Checksum",
83-
"log_tag": "Fetched Prerequisite Objects",
81+
$ jq .normal "$SCUBA" | grep -e "Packfile" -e "GitImport" -e "Bookmark movement" -e "Prerequisite" -e "Objects" -e "Prefetched" -e "Content Blob" -e "Bonsai Changeset" -e "Finalize Batch" | sort
82+
"log_tag": "Bookmark movement completed",
83+
"log_tag": "Completed Finalize Batch",
84+
"log_tag": "Created Bonsai Changeset for Git Commit",
85+
"log_tag": "Created Bonsai Changeset for Git Commit",
8486
"log_tag": "Decoded objects from Packfile",
87+
"log_tag": "Fetched Prerequisite Objects",
88+
"log_tag": "GitImport, Derivation and Bonsai creation completed",
8589
"log_tag": "Parsed complete Packfile",
8690
"log_tag": "Prefetched existing BonsaiGit Mappings",
91+
"log_tag": "Sent Packfile OK",
8792
"log_tag": "Uploaded Content Blob, Git Blob, Commits and Trees",
8893
"log_tag": "Uploaded Content Blob, Git Blob, Commits and Trees",
8994
"log_tag": "Uploaded Content Blob, Git Blob, Commits and Trees",
90-
"log_tag": "Created Bonsai Changeset for Git Commit",
91-
"log_tag": "Created Bonsai Changeset for Git Commit",
92-
"log_tag": "Completed Finalize Batch",
93-
"log_tag": "GitImport, Derivation and Bonsai creation completed",
94-
"log_tag": "Sent Packfile OK",
95-
"log_tag": "Bookmark movement completed",
95+
"log_tag": "Verified Packfile Checksum",

0 commit comments

Comments
 (0)