Alias verify tests remove blobimport

Summary: Remove blobimport from alias-verify test

Reviewed By: quark-zju

Differential Revision: D64272522

fbshipit-source-id: 37da3409e22a36d82c2d2d8115886c59819127ea

eden/mononoke/tests/integration/TARGETS

@@ -64,8 +64,8 @@ dott_test(
     dott_files = ["test-alias-verify.t"],
     deps = [
         "//eden/mononoke:aliasverify",
-        "//eden/mononoke:blobimport",
         "//eden/mononoke:mononoke",
+        "//eden/mononoke/tools/testtool:testtool",
     ],
 )
 

eden/mononoke/tests/integration/test-alias-verify.t

@@ -13,35 +13,29 @@
   $ setup_common_config $REPOTYPE
   $ cd $TESTTMP
 
-  $ hginit_treemanifest repo
-  $ cd repo
-# Commit files
-  $ echo f1 > f1
-  $ hg commit -Aqm "f1"
-  $ echo f2 > f2
-  $ hg commit -Aqm "f2"
-  $ echo f3 > f3
-  $ hg commit -Aqm "f1"
+  $ quiet testtool_drawdag -R repo << EOF
+  > C
+  > |
+  > B
+  > |
+  > A
+  > # bookmark: C master_bookmark
+  > EOF
 
-  $ hg bookmark master_bookmark -r tip
-
-  $ cd ..
-
-  $ blobimport repo/.hg repo
 
   $ ls $TESTTMP/blobstore/blobs | grep "alias"
-  blob-repo0000.alias.gitsha1.45d9e0e9fc8859787c33081dffdf12f41b54fcf3
-  blob-repo0000.alias.gitsha1.8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b
-  blob-repo0000.alias.gitsha1.9de77c18733ab8009a956c25e28c85fe203a17d7
-  blob-repo0000.alias.seeded_blake3.612c92c71a0f363c11b4bd01861e1a00a4bb663cd8473327ff36d77baef1bce9
-  blob-repo0000.alias.seeded_blake3.c215015b756ebffc2d7a1c02926937f2a572e7143a021b7ed48aeec7d735d2b4
-  blob-repo0000.alias.seeded_blake3.d454123e25942306cb55ff51fb153919dc4cb2f4d25d1bbdb4f40acfe60d8d67
-  blob-repo0000.alias.sha1.1c49a440c352f3473efa9512255033b94dc7def0
-  blob-repo0000.alias.sha1.aece6dfba588900e00d95601d22b4408d49580af
-  blob-repo0000.alias.sha1.b4c4c2a335010e242576b05f3e0b673adfa58bc8
-  blob-repo0000.alias.sha256.2ba85baaa7922ff4c0dfdbc00fd07bd69dcb1dce745c6a8c676fe8b5642a0d66
-  blob-repo0000.alias.sha256.b9a294f298d0ed2b65ca4488a42b473ff5f75d0b9843cbea84e1b472f9a514d1
-  blob-repo0000.alias.sha256.d690916cdea320e620748799a2051a0f4e07d6d0c3e2bc199ea3c69e0c0b5e4f
+  blob-repo0000.alias.gitsha1.7371f47a6f8bd23a8fa1a8b2a9479cdd76380e54
+  blob-repo0000.alias.gitsha1.8c7e5a667f1b771847fe88c01c3de34413a1b220
+  blob-repo0000.alias.gitsha1.96d80cd6c4e7158dbebd0849f4fb7ce513e5828c
+  blob-repo0000.alias.seeded_blake3.5667f2421ac250c4bb9af657b5ead3cdbd940bfbc350b2bfee47454643832b48
+  blob-repo0000.alias.seeded_blake3.5ad3ba58a716e5fc04296ac9af7a1420f726b401fdf16d270beb5b6b30bc0cda
+  blob-repo0000.alias.seeded_blake3.6fb4c384e79ac0771a483fcf3c46fb4ea8609f79608e8bcbf710f9887a3b9cf6
+  blob-repo0000.alias.sha1.32096c2e0eff33d844ee6d675407ace18289357d
+  blob-repo0000.alias.sha1.6dcd4ce23d88e2ee9568ba546c007c63d9131c1b
+  blob-repo0000.alias.sha1.ae4f281df5a5d0ff3cad6371f76d5c29b6d953ec
+  blob-repo0000.alias.sha256.559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd
+  blob-repo0000.alias.sha256.6b23c0d5f35d1b11f9b683f0b0a617355deb11277d91ae091d399c655b87940d
+  blob-repo0000.alias.sha256.df7e70e5021544f4834bbee64a9e3789febc4be81470df629cad6ddb03320a5c
 
 #Alias verfification with Sha256 alias
   $ aliasverify verify sha256 2>&1 | grep "Alias Verification"
@@ -70,59 +64,59 @@
 
 #Missing Sha256 aliases
   $ aliasverify verify sha256 --debug 2>&1 | grep "Missing alias blob" | cut -d" " -f6- | sort
-  Missing alias blob: alias Sha256(2ba85baaa7922ff4c0dfdbc00fd07bd69dcb1dce745c6a8c676fe8b5642a0d66), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
-  Missing alias blob: alias Sha256(b9a294f298d0ed2b65ca4488a42b473ff5f75d0b9843cbea84e1b472f9a514d1), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
-  Missing alias blob: alias Sha256(d690916cdea320e620748799a2051a0f4e07d6d0c3e2bc199ea3c69e0c0b5e4f), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
+  Missing alias blob: alias Sha256(559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias Sha256(6b23c0d5f35d1b11f9b683f0b0a617355deb11277d91ae091d399c655b87940d), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
+  Missing alias blob: alias Sha256(df7e70e5021544f4834bbee64a9e3789febc4be81470df629cad6ddb03320a5c), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
 #Missing SeededBlake3 aliases
   $ aliasverify verify seeded-blake3 --debug 2>&1 | grep "Missing alias blob" | cut -d" " -f6- | sort
-  Missing alias blob: alias Blake3(612c92c71a0f363c11b4bd01861e1a00a4bb663cd8473327ff36d77baef1bce9), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
-  Missing alias blob: alias Blake3(c215015b756ebffc2d7a1c02926937f2a572e7143a021b7ed48aeec7d735d2b4), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
-  Missing alias blob: alias Blake3(d454123e25942306cb55ff51fb153919dc4cb2f4d25d1bbdb4f40acfe60d8d67), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
+  Missing alias blob: alias Blake3(5667f2421ac250c4bb9af657b5ead3cdbd940bfbc350b2bfee47454643832b48), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
+  Missing alias blob: alias Blake3(5ad3ba58a716e5fc04296ac9af7a1420f726b401fdf16d270beb5b6b30bc0cda), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias Blake3(6fb4c384e79ac0771a483fcf3c46fb4ea8609f79608e8bcbf710f9887a3b9cf6), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
 #Missing Sha1 aliases
   $ aliasverify verify sha1 --debug 2>&1 | grep "Missing alias blob" | cut -d" " -f6- | sort
-  Missing alias blob: alias Sha1(1c49a440c352f3473efa9512255033b94dc7def0), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
-  Missing alias blob: alias Sha1(aece6dfba588900e00d95601d22b4408d49580af), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
-  Missing alias blob: alias Sha1(b4c4c2a335010e242576b05f3e0b673adfa58bc8), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
+  Missing alias blob: alias Sha1(32096c2e0eff33d844ee6d675407ace18289357d), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
+  Missing alias blob: alias Sha1(6dcd4ce23d88e2ee9568ba546c007c63d9131c1b), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias Sha1(ae4f281df5a5d0ff3cad6371f76d5c29b6d953ec), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
 #Missing GitSha1 aliases
   $ aliasverify verify git-sha1 --debug 2>&1 | grep "Missing alias blob" | cut -d" " -f6- | sort
-  Missing alias blob: alias GitSha1(45d9e0e9fc8859787c33081dffdf12f41b54fcf3), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
-  Missing alias blob: alias GitSha1(8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
-  Missing alias blob: alias GitSha1(9de77c18733ab8009a956c25e28c85fe203a17d7), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
+  Missing alias blob: alias GitSha1(7371f47a6f8bd23a8fa1a8b2a9479cdd76380e54), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
+  Missing alias blob: alias GitSha1(8c7e5a667f1b771847fe88c01c3de34413a1b220), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias GitSha1(96d80cd6c4e7158dbebd0849f4fb7ce513e5828c), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
 
   $ ls $TESTTMP/blobstore/blobs | grep "alias" | wc -l
   0
 
 #Generate Sha256 aliases
   $ aliasverify generate sha256 --debug 2>&1 | grep "Missing alias blob"  | cut -d" " -f6- | sort
-  Missing alias blob: alias Sha256(2ba85baaa7922ff4c0dfdbc00fd07bd69dcb1dce745c6a8c676fe8b5642a0d66), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
-  Missing alias blob: alias Sha256(b9a294f298d0ed2b65ca4488a42b473ff5f75d0b9843cbea84e1b472f9a514d1), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
-  Missing alias blob: alias Sha256(d690916cdea320e620748799a2051a0f4e07d6d0c3e2bc199ea3c69e0c0b5e4f), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
+  Missing alias blob: alias Sha256(559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias Sha256(6b23c0d5f35d1b11f9b683f0b0a617355deb11277d91ae091d399c655b87940d), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
+  Missing alias blob: alias Sha256(df7e70e5021544f4834bbee64a9e3789febc4be81470df629cad6ddb03320a5c), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
 #Generate SeededBlake3 aliases
   $ aliasverify generate seeded-blake3 --debug 2>&1 | grep "Missing alias blob"  | cut -d" " -f6- | sort
-  Missing alias blob: alias Blake3(612c92c71a0f363c11b4bd01861e1a00a4bb663cd8473327ff36d77baef1bce9), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
-  Missing alias blob: alias Blake3(c215015b756ebffc2d7a1c02926937f2a572e7143a021b7ed48aeec7d735d2b4), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
-  Missing alias blob: alias Blake3(d454123e25942306cb55ff51fb153919dc4cb2f4d25d1bbdb4f40acfe60d8d67), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
+  Missing alias blob: alias Blake3(5667f2421ac250c4bb9af657b5ead3cdbd940bfbc350b2bfee47454643832b48), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
+  Missing alias blob: alias Blake3(5ad3ba58a716e5fc04296ac9af7a1420f726b401fdf16d270beb5b6b30bc0cda), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias Blake3(6fb4c384e79ac0771a483fcf3c46fb4ea8609f79608e8bcbf710f9887a3b9cf6), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
 #Generate Sha1 aliases
   $ aliasverify generate sha1 --debug 2>&1 | grep "Missing alias blob"  | cut -d" " -f6- | sort
-  Missing alias blob: alias Sha1(1c49a440c352f3473efa9512255033b94dc7def0), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
-  Missing alias blob: alias Sha1(aece6dfba588900e00d95601d22b4408d49580af), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
-  Missing alias blob: alias Sha1(b4c4c2a335010e242576b05f3e0b673adfa58bc8), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
+  Missing alias blob: alias Sha1(32096c2e0eff33d844ee6d675407ace18289357d), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
+  Missing alias blob: alias Sha1(6dcd4ce23d88e2ee9568ba546c007c63d9131c1b), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias Sha1(ae4f281df5a5d0ff3cad6371f76d5c29b6d953ec), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
 #Generate GitSha1 aliases
   $ aliasverify generate git-sha1 --debug 2>&1 | grep "Missing alias blob"  | cut -d" " -f6- | sort
-  Missing alias blob: alias GitSha1(45d9e0e9fc8859787c33081dffdf12f41b54fcf3), content_id ContentId(Blake2(1a3f1094cdae123ec6999b7baf4211ffd94f47970bedd71e13ec07f24a9aba6a)), repo: repo
-  Missing alias blob: alias GitSha1(8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b), content_id ContentId(Blake2(7ee06cac57ab4267c097ebc8ec36e903fb3c25867934fe360e069ea1ab2ed7fd)), repo: repo
-  Missing alias blob: alias GitSha1(9de77c18733ab8009a956c25e28c85fe203a17d7), content_id ContentId(Blake2(1af04efffa454f843420a538617f0c4166550da421b65a59ed95a85b43a25ada)), repo: repo
+  Missing alias blob: alias GitSha1(7371f47a6f8bd23a8fa1a8b2a9479cdd76380e54), content_id ContentId(Blake2(55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f)), repo: repo
+  Missing alias blob: alias GitSha1(8c7e5a667f1b771847fe88c01c3de34413a1b220), content_id ContentId(Blake2(eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9)), repo: repo
+  Missing alias blob: alias GitSha1(96d80cd6c4e7158dbebd0849f4fb7ce513e5828c), content_id ContentId(Blake2(896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d)), repo: repo
 
   $ ls $TESTTMP/blobstore/blobs | grep "alias"
-  blob-repo0000.alias.gitsha1.45d9e0e9fc8859787c33081dffdf12f41b54fcf3
-  blob-repo0000.alias.gitsha1.8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b
-  blob-repo0000.alias.gitsha1.9de77c18733ab8009a956c25e28c85fe203a17d7
-  blob-repo0000.alias.seeded_blake3.612c92c71a0f363c11b4bd01861e1a00a4bb663cd8473327ff36d77baef1bce9
-  blob-repo0000.alias.seeded_blake3.c215015b756ebffc2d7a1c02926937f2a572e7143a021b7ed48aeec7d735d2b4
-  blob-repo0000.alias.seeded_blake3.d454123e25942306cb55ff51fb153919dc4cb2f4d25d1bbdb4f40acfe60d8d67
-  blob-repo0000.alias.sha1.1c49a440c352f3473efa9512255033b94dc7def0
-  blob-repo0000.alias.sha1.aece6dfba588900e00d95601d22b4408d49580af
-  blob-repo0000.alias.sha1.b4c4c2a335010e242576b05f3e0b673adfa58bc8
-  blob-repo0000.alias.sha256.2ba85baaa7922ff4c0dfdbc00fd07bd69dcb1dce745c6a8c676fe8b5642a0d66
-  blob-repo0000.alias.sha256.b9a294f298d0ed2b65ca4488a42b473ff5f75d0b9843cbea84e1b472f9a514d1
-  blob-repo0000.alias.sha256.d690916cdea320e620748799a2051a0f4e07d6d0c3e2bc199ea3c69e0c0b5e4f
+  blob-repo0000.alias.gitsha1.7371f47a6f8bd23a8fa1a8b2a9479cdd76380e54
+  blob-repo0000.alias.gitsha1.8c7e5a667f1b771847fe88c01c3de34413a1b220
+  blob-repo0000.alias.gitsha1.96d80cd6c4e7158dbebd0849f4fb7ce513e5828c
+  blob-repo0000.alias.seeded_blake3.5667f2421ac250c4bb9af657b5ead3cdbd940bfbc350b2bfee47454643832b48
+  blob-repo0000.alias.seeded_blake3.5ad3ba58a716e5fc04296ac9af7a1420f726b401fdf16d270beb5b6b30bc0cda
+  blob-repo0000.alias.seeded_blake3.6fb4c384e79ac0771a483fcf3c46fb4ea8609f79608e8bcbf710f9887a3b9cf6
+  blob-repo0000.alias.sha1.32096c2e0eff33d844ee6d675407ace18289357d
+  blob-repo0000.alias.sha1.6dcd4ce23d88e2ee9568ba546c007c63d9131c1b
+  blob-repo0000.alias.sha1.ae4f281df5a5d0ff3cad6371f76d5c29b6d953ec
+  blob-repo0000.alias.sha256.559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd
+  blob-repo0000.alias.sha256.6b23c0d5f35d1b11f9b683f0b0a617355deb11277d91ae091d399c655b87940d
+  blob-repo0000.alias.sha256.df7e70e5021544f4834bbee64a9e3789febc4be81470df629cad6ddb03320a5c