From 596fb348292015d7e6adbee7d40cfb52faec3800 Mon Sep 17 00:00:00 2001
From: Kostia Balytskyi <ikostia@fb.com>
Date: Mon, 18 Nov 2019 06:14:44 -0800
Subject: [PATCH] mononoke: make test-push-redirector-sync-job rewrite dates

Summary: Let's make it resemble prod setup more.

Reviewed By: farnz

Differential Revision: D18570692

fbshipit-source-id: b732639dd67409ae802f5aa8bf4d928f00326d7c
---
 .../test-push-redirector-sync-job.t           | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tests/integration/test-push-redirector-sync-job.t b/tests/integration/test-push-redirector-sync-job.t
index 5340fed459..75849095bf 100644
--- a/tests/integration/test-push-redirector-sync-job.t
+++ b/tests/integration/test-push-redirector-sync-job.t
@@ -12,7 +12,7 @@
   > }
   > EOF
 
-  $ init_large_small_repo --local-configerator-path="$TESTTMP/configerator"
+  $ PUSHREBASE_REWRITE_DATES=1 init_large_small_repo --local-configerator-path="$TESTTMP/configerator"
   Setting up hg server repos
   Blobimporting them
   Starting Mononoke server
@@ -24,38 +24,41 @@
   $ echo 2 > 2 && hg addremove -q && hg ci -q -m newcommit
   $ REPONAME=small-mon hgmn push -r . --to master_bookmark | grep updating
   updating bookmark master_bookmark
--- newcommit was correctly pushed to master_bookmark
+-- newcommit was correctly pushed to master_bookmark (we need to update, as it's a new commit with date rewriting)
+  $ REPONAME=small-mon hgmn up -q master_bookmark
   $ log -r master_bookmark
-  @  newcommit [public;rev=2;ce81c7d38286] default/master_bookmark
+  @  newcommit [public;rev=3;*] default/master_bookmark (glob)
   |
   ~
 
 -- newcommit is also present in the large repo (after a pull)
   $ cd "$TESTTMP"/large-hg-client
   $ log -r master_bookmark
-  o  first post-move commit [public;rev=2;bfcfb674663c] default/master_bookmark
+  o  first post-move commit [public;rev=2;*] default/master_bookmark (glob)
   |
   ~
   $ REPONAME=large-mon hgmn pull -q
   $ log -r master_bookmark
-  o  newcommit [public;rev=3;819e91b238b7] default/master_bookmark
+  o  newcommit [public;rev=3;*] default/master_bookmark (glob)
   |
   ~
+  $ verify_wc master_bookmark
 
--- Mononoke hg sync job: the commit is now present in the small hg repo
+-- Mononoke hg sync job: the commit is now present in the small hg repo server
   $ cd "$TESTTMP"
   $ REPOID="$REPOIDSMALL" mononoke_hg_sync small-hg-srv 2 2>&1 | grep "successful sync"
   * successful sync of entries [4] (glob)
   $ cd small-hg-srv
   $ log -r :
-  o  newcommit [public;rev=2;ce81c7d38286]
+  o  newcommit [public;rev=2;*] (glob)
   |
-  @  first post-move commit [public;rev=1;11f848659bfc]
+  @  first post-move commit [public;rev=1;*] (glob)
   |
-  o  pre-move commit [public;rev=0;fc7ae591de0e]
+  o  pre-move commit [public;rev=0;*] (glob)
   
+
   $ hg show master_bookmark
-  changeset:   2:ce81c7d38286
+  changeset:   2:* (glob)
   bookmark:    master_bookmark
   tag:         tip
   user:        test
@@ -65,7 +68,7 @@
   newcommit
   
   
-  diff -r 11f848659bfc -r ce81c7d38286 2
+  diff -r * -r * 2 (glob)
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/2	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@