fix test-push-redirector-pushrebase afer migration

Summary: test was broken due to migration D63999703

Reviewed By: liubov-dmitrieva

Differential Revision: D64278219

fbshipit-source-id: a63a39b8e2f3f2c722fe5c3c4479100b3f55f6eb

eden/mononoke/tests/integration/push_redirector/test-push-redirector-pushrebase.t

@@ -4,7 +4,6 @@
 # GNU General Public License found in the LICENSE file in the root
 # directory of this source tree.
 
-FIXME! - sorry, this test is broken due to migration D63999703
   $ export COMMIT_SCRIBE_CATEGORY=mononoke_commits
   $ export BOOKMARK_SCRIBE_CATEGORY=mononoke_bookmark
   $ export MONONOKE_TEST_SCRIBE_LOGGING_DIRECTORY=$TESTTMP/scribe_logs/
@@ -52,6 +51,7 @@ Normal pushrebase with one commit
   @  first post-move commit [public;rev=2;bfcfb674663c] default/master_bookmark
   │
   ~
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ log -r master_bookmark
   o  newcommit [public;rev=3;819e91b238b7] default/master_bookmark
@@ -83,6 +83,7 @@ Noop bookmark-only pushrebase
 
 -- this is not a `common_pushrebase_bookmark`, so should be prefixed
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ hg book --all
   no bookmarks set
@@ -99,6 +100,7 @@ Delete a bookmark
   no bookmarks set
      default/master_bookmark   ce81c7d38286
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ hg book --all
   no bookmarks set
@@ -129,6 +131,7 @@ Normal pushrebase with many commits
   ~
 -- this should also be present in a large repo, once we pull:
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ log -r master_bookmark
   o  The staunchest tramp to ply his trade [public;rev=7;34c34be6efde] default/master_bookmark
@@ -172,6 +175,7 @@ Pushrebase, which replaces a directory with a file
   ~
 -- this should also be present in a large repo, once we pull
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ log -r master_bookmark
   o  Replace a directory with a file [public;rev=9;6ac00e7afd93] default/master_bookmark
@@ -191,6 +195,7 @@ Normal pushrebase to a prefixed bookmark
   ~
 -- this should also be present in a large repo, once we pull
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ log -r bookprefix/master_bookmark_2
   o  The epicness of this fail is great [public;rev=10;030470259cb4] default/bookprefix/master_bookmark_2
@@ -209,6 +214,7 @@ Normal pushrebase to a prefixed bookmark
   ~
 -- this should also be present in a large repo, once we pull
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ log -r bookprefix/master_bookmark_2
   o  The epicness of this fail is greater [public;rev=11;ccbb367ae93a] default/bookprefix/master_bookmark_2
@@ -226,6 +232,7 @@ Pushrebase with a rename between a shifted and a non-shifted behavior
   updated remote bookmark master_bookmark to 6e3fc27a15b1
 -- let's sync it, make sure everything is fine
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ hg up -q master_bookmark
   $ ls non_path_shifting
@@ -241,6 +248,7 @@ Pushrebase with a rename between a shifted and a non-shifted behavior
   updated remote bookmark master_bookmark to 4273bf9c3d03
 -- let's also sync it to the large repo
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ hg up -q master_bookmark
   $ ls non_path_shifting/filetomove
@@ -259,6 +267,7 @@ Pushrebase with a rename between a shifted and a non-shifted behavior
   updated remote bookmark master_bookmark to eb96c35ce02c
 -- let's also sync it to the large repo
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ hg up -q master_bookmark
   $ ls non_path_shifting
@@ -282,6 +291,7 @@ Pushrebase, which replaces a file with a directory
   ~
 -- this should also be present in a large repo, once we pull
   $ cd "$TESTTMP/large-hg-client"
+  $ wait_for_bookmark_move_away_edenapi "$LARGE_REPO_NAME" master_bookmark "$(hg whereami)"
   $ hg pull -q
   $ hg up -q master_bookmark
   $ ls smallrepofolder/subdir