Fix small test

run.sh

@@ -109,7 +109,7 @@ python3 src/python/merge_analyzer.py \
     --output_dir "$OUT_DIR/merges_analyzed/" \
     --n_sampled_merges "$N_MERGES" \
     --cache_dir "$CACHE_DIR"
-exit 0
+
 python3 src/python/merge_tester.py \
     --repos_head_passes_csv "$OUT_DIR/local_repos.csv" \
     --merges_path "$OUT_DIR/merges_analyzed/" \

src/python/merge_tester.py

@@ -114,13 +114,11 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series:
 def build_arguments(
     args: argparse.Namespace,
     repo_slug: str,
-    n_sampled_merges: int,
 ) -> list:
     """Builds the arguments for the merge_tester function.
     Args:
         args (argparse.Namespace): The arguments of the script.
         repo_slug (str): The slug of the repository.
-        n_sampled_merges (int): The number of merges to sample.
     Returns:
         list: The arguments for the merge_tester function.
     """
@@ -155,12 +153,7 @@ def build_arguments(
             "because it does not contain any merges.",
         )
         return []
-    merges = merges[merges["test merge"]]
-    merges = (
-        merges.sample(n_sampled_merges, random_state=42)
-        if len(merges) > n_sampled_merges
-        else merges
-    )
+    merges = merges[merges["sampled for testing"]]
     return [
         (repo_slug, merge_data, Path(args.cache_dir))
         for _, merge_data in merges.iterrows()
@@ -172,7 +165,6 @@ def main():  # pylint: disable=too-many-locals,too-many-statements
     print("merge_tester: Start")
     parser = argparse.ArgumentParser()
     parser.add_argument("--repos_head_passes_csv", type=Path)
-    parser.add_argument("--n_sampled_merges", type=int)
     parser.add_argument("--merges_path", type=Path)
     parser.add_argument("--output_dir", type=Path)
     parser.add_argument("--cache_dir", type=Path, default="cache/")
@@ -187,7 +179,7 @@ def main():  # pylint: disable=too-many-locals,too-many-statements
     for _, repository_data in tqdm(repos.iterrows(), total=len(repos)):
         repo_slug = repository_data["repository"]
         merge_tester_arguments += build_arguments(
-            args, repo_slug, args.n_sampled_merges
+            args, repo_slug
         )
 
     # Shuffle input to reduce cache contention

test/small-goal-files/merges_analyzed/Algorithms.csv

@@ -1,21 +1,21 @@
-idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge
-1,refs/heads/master,44ce61beeb8bb5c5c1289db02f1da53f6bff6d8a,e121b3943958ba1558d8828db6f13c632e99f298,58129e828567fac52e821ca147feeab87a95d780,a parent is the base,92,False,7c30f2d67f153fbbdc9f62b081b97a0934b26589e57098e040802578d268baba,Tests_passed,0.97065981611682,True,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Tests_passed,0.9707428879600917,False
-2,refs/heads/master,e866ae7916d6b763f7d32f72f54edd735b5ea6bc,ae5dac889d19edd6c773e60420f00d4e7177f31f,4342b16e18da9082b32d5b8e9b5b6e3378461ce4,,147,False,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Tests_passed,0.9712210497464712,True,fee471ff366749b92c431eeda17d56aa56701470f3a81f94355c76e798414ab4,Tests_passed,0.97065981611682,False
-3,refs/heads/master,ae5dac889d19edd6c773e60420f00d4e7177f31f,38ec459e6f163991c6f88210720dcda4fecc64e8,eb3260404e596031bc9ee037b29bd1fcbb87f625,a parent is the base,60,False,20bd8c223130349dd809f82f7db86c666542e29cc3b8ccc7bdd5af4f64ca2714,Tests_passed,0.9712210497464712,True,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Tests_passed,0.9712210497464712,False
-4,refs/heads/master,38ec459e6f163991c6f88210720dcda4fecc64e8,60d87e9a120e330eb34c9d558d0f00e52b5ce438,aa882141f26ef82107658c214ec18a799403bb57,a parent is the base,115,False,b131f1d3a6eb49c1bce5bb16a98c0773ec1ae7da734606adbffc9dc49e2fbd66,Tests_passed,0.9710344827586207,True,20bd8c223130349dd809f82f7db86c666542e29cc3b8ccc7bdd5af4f64ca2714,Tests_passed,0.9712210497464712,False
-5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,272,False,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,0.9712210497464712,True,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,0.9712210497464712,False
-6,refs/heads/master,60d87e9a120e330eb34c9d558d0f00e52b5ce438,bceffabe0d850ea9c67c93a9fb578d2ca8600022,9aa3611952f1715d8f5cf6404a3dad0e95bf175f,a parent is the base,17,False,3b9bb6653ccc005056a8a612a5928c82abbd77316b0fa7373d0712d9f60bc6de,Tests_passed,0.9710344827586207,True,b131f1d3a6eb49c1bce5bb16a98c0773ec1ae7da734606adbffc9dc49e2fbd66,Tests_passed,0.9710344827586207,False
-7,refs/heads/master,bceffabe0d850ea9c67c93a9fb578d2ca8600022,247b66cb2c7792336c5d1c2c1502a55d5222c823,67360ca7159643f3a9fc20f30e164b36a4e4f859,,266,False,fa572e9c4b0d7ba3bf20e8a02b40bd830f209e1509841e173189aa4d0eb35457,Tests_passed,0.9711419541019651,True,3b9bb6653ccc005056a8a612a5928c82abbd77316b0fa7373d0712d9f60bc6de,Tests_passed,0.9710344827586207,False
-8,refs/heads/master,247b66cb2c7792336c5d1c2c1502a55d5222c823,c7c288a43e324748f1f25ee72f9639d808c70b7e,7f89b8c5fbe85848e96a0cdaffb83664588c8474,a parent is the base,38,False,3cfe8a22fae5090d17f4c2fb31efa32ed67412be70f5e41909792872032eff13,Tests_passed,0.9711419541019651,True,fa572e9c4b0d7ba3bf20e8a02b40bd830f209e1509841e173189aa4d0eb35457,Tests_passed,0.9711419541019651,False
-9,refs/heads/master,c7c288a43e324748f1f25ee72f9639d808c70b7e,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,296f6b09446b63e8b036e4840879c2d890ae925d,a parent is the base,21,False,16ffc55222112897157b65a9a305d7d9f0a6d2c91d4768dd26d885fa148d3c33,Tests_passed,0.9711181405583826,True,3cfe8a22fae5090d17f4c2fb31efa32ed67412be70f5e41909792872032eff13,Tests_passed,0.9711419541019651,False
-10,refs/heads/master,216529baa98d8646b192b1c6897b01d3181f2ac6,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,deaa316e2165940e50e4e00e83e18d27417fb642,a parent is the base,31,False,16ffc55222112897157b65a9a305d7d9f0a6d2c91d4768dd26d885fa148d3c33,Tests_passed,0.9711181405583826,True,6a968765e20e32aa0ccfb3b9c39d351f36e7f6a02c2b5c93a69ddc82b0063e44,Tests_passed,0.9676008202323991,False
-11,refs/heads/master,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,128ccf0f25f401f2218c03166a6f4ebc5ce21385,03d7c1872d5b17434fd460f7b8a0b8c9c90849f7,a parent is the base,39,False,3be3867629eb4ed141509a8a8b8e32f4f535d8fc94803e6d896b31a08dbdad6b,Tests_passed,0.97108234646103,True,16ffc55222112897157b65a9a305d7d9f0a6d2c91d4768dd26d885fa148d3c33,Tests_passed,0.9711181405583826,False
-12,refs/heads/master,128ccf0f25f401f2218c03166a6f4ebc5ce21385,1f8f61c50d4e36ab8677b271a58648e90a2f1b28,22ee3ce03f74349ed3b0f36bfdf1dc119e2be70b,a parent is the base,29,False,42a1ba4ec7eb8649d2d3299078713b66afc5bb00b269a92be940e4b4ad14163c,Tests_passed,0.9712826176998481,True,3be3867629eb4ed141509a8a8b8e32f4f535d8fc94803e6d896b31a08dbdad6b,Tests_passed,0.97108234646103,False
-13,refs/heads/master,c8604d6f6d23a0cd5d3f9fac472dbf467fe11b8e,7ebdadbc657a68da22826ce3cc402e3635e80d4c,fd87cbc2cdbe813564f0a2c7e8070964220cdcc6,a parent is the base,21,False,480c0d0c75bba90a670ac3c07f6afc5c61c394d0d6c1ba59468503b47ad2e849,Tests_passed,0.9712270023516393,True,4487d24e3a4cfb37622bc594cbd8e3ec74fa77f0381121247d246d83434e5867,Tests_passed,0.9712826176998481,False
-14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,17,False,b00db31ee0ff34d2b38aaba8f8c3346627eafe18da6b0102a2b8d0cb75d11567,Tests_passed,0.9708176438945669,True,d246e3670ab5e0ba5a4d0ea8c24a62b33d3fe0f78c1a821a23bac0bc739c5ec3,Tests_passed,0.9707940780619112,False
-15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,94,False,7aa5e2f53ad1560daf3a96bd8e663a929817c73938d959fa60d355658fa2e2be,Tests_failed,0.0,False,755c5c56e067df81d5c17ef49dc1f4e7678609ab296b9a8ab2dece46fe0e4fde,Tests_failed,0.0,False
-16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,123,False,750234862e2408f85646f30ab36d0dbcfdac88dba376d8c3d61d70f4487afd25,Tests_failed,0.0,False,cb9d190fba5816b072ac476d8c839e907344d0b8211d512779f5521a6dbf954e,Tests_passed,0.97102615694165,False
-17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,96,False,bdf6e72ad28bbb283d5760e9a231b0df40640519b3e3cfd5e3f0ccda8c93fc8d,Tests_passed,0.9459424423126782,False,1a54a2f1e9d5a185842f1ebcbb59a35d16b5d948671ad2f6eb75fc88bf0831d3,Tests_failed,0.0,False
-18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,70,False,876fec686e8da05d3343c630aba013323e9f9cdd6bf4252242d093211d7052d4,Tests_failed,0.0,False,481269e0b8f9bfc8b74b1541ab78f98aa9364d3e17bf7f640b95ffc2376ab1c4,Tests_failed,0.0,False
-19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,110,False,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,0.9711205749268033,True,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,0.9711321005720367,False
-20,refs/remotes/origin/pull/73,9c8740d0e38ba93f08bfb462d16cab448a0197f1,7ebdadbc657a68da22826ce3cc402e3635e80d4c,4e2214112de23d1319ce77736547fa8900384e7c,a parent is the base,1006,False,480c0d0c75bba90a670ac3c07f6afc5c61c394d0d6c1ba59468503b47ad2e849,Tests_passed,0.9712270023516393,True,d02d6c3c9e716e52368f24ba6495f28e8fd4773601dc017f861e81fd4e6bfaf8,Tests_passed,0.974043350280974,False
+idx,branch_name,merge,left,right,notes,sampled for testing,left_tree_fingerprint,right_tree_fingerprint,diff_size,diff_contains_java_file,left parent test result,left parent test coverage,right parent test result,right parent test coverage,parents pass,test merge
+1,refs/heads/master,44ce61beeb8bb5c5c1289db02f1da53f6bff6d8a,e121b3943958ba1558d8828db6f13c632e99f298,58129e828567fac52e821ca147feeab87a95d780,a parent is the base,False,,,24,False,,,,,,False
+2,refs/heads/master,e866ae7916d6b763f7d32f72f54edd735b5ea6bc,ae5dac889d19edd6c773e60420f00d4e7177f31f,4342b16e18da9082b32d5b8e9b5b6e3378461ce4,,False,,,101,False,,,,,,False
+3,refs/heads/master,ae5dac889d19edd6c773e60420f00d4e7177f31f,38ec459e6f163991c6f88210720dcda4fecc64e8,eb3260404e596031bc9ee037b29bd1fcbb87f625,a parent is the base,False,,,19,False,,,,,,False
+4,refs/heads/master,38ec459e6f163991c6f88210720dcda4fecc64e8,60d87e9a120e330eb34c9d558d0f00e52b5ce438,aa882141f26ef82107658c214ec18a799403bb57,a parent is the base,False,,,83,False,,,,,,False
+5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,False,,,128,False,,,,,,False
+6,refs/heads/master,60d87e9a120e330eb34c9d558d0f00e52b5ce438,bceffabe0d850ea9c67c93a9fb578d2ca8600022,9aa3611952f1715d8f5cf6404a3dad0e95bf175f,a parent is the base,False,,,3,False,,,,,,False
+7,refs/heads/master,bceffabe0d850ea9c67c93a9fb578d2ca8600022,247b66cb2c7792336c5d1c2c1502a55d5222c823,67360ca7159643f3a9fc20f30e164b36a4e4f859,,False,,,110,False,,,,,,False
+8,refs/heads/master,247b66cb2c7792336c5d1c2c1502a55d5222c823,c7c288a43e324748f1f25ee72f9639d808c70b7e,7f89b8c5fbe85848e96a0cdaffb83664588c8474,a parent is the base,False,,,8,False,,,,,,False
+9,refs/heads/master,c7c288a43e324748f1f25ee72f9639d808c70b7e,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,296f6b09446b63e8b036e4840879c2d890ae925d,a parent is the base,False,,,5,False,,,,,,False
+10,refs/heads/master,216529baa98d8646b192b1c6897b01d3181f2ac6,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,deaa316e2165940e50e4e00e83e18d27417fb642,a parent is the base,False,,,13,False,,,,,,False
+11,refs/heads/master,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,128ccf0f25f401f2218c03166a6f4ebc5ce21385,03d7c1872d5b17434fd460f7b8a0b8c9c90849f7,a parent is the base,False,,,18,False,,,,,,False
+12,refs/heads/master,128ccf0f25f401f2218c03166a6f4ebc5ce21385,1f8f61c50d4e36ab8677b271a58648e90a2f1b28,22ee3ce03f74349ed3b0f36bfdf1dc119e2be70b,a parent is the base,False,,,8,False,,,,,,False
+13,refs/heads/master,c8604d6f6d23a0cd5d3f9fac472dbf467fe11b8e,7ebdadbc657a68da22826ce3cc402e3635e80d4c,fd87cbc2cdbe813564f0a2c7e8070964220cdcc6,a parent is the base,False,,,9,False,,,,,,False
+14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,False,,,3,False,,,,,,False
+15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,False,,,37,False,,,,,,False
+16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,False,,,39,False,,,,,,False
+17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,False,,,33,False,,,,,,False
+18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,False,,,28,False,,,,,,False
+19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,False,,,41,False,,,,,,False
+20,refs/remotes/origin/pull/73,9c8740d0e38ba93f08bfb462d16cab448a0197f1,7ebdadbc657a68da22826ce3cc402e3635e80d4c,4e2214112de23d1319ce77736547fa8900384e7c,a parent is the base,False,,,511,False,,,,,,False