.

Author: petrelharp

tests/recipe_specs.py

@@ -39,7 +39,7 @@
     "recipe_nonWF_nonstacked.slim":            {"nonWF": True, "nonstacked": True},
     "recipe_init_mutated_WF.slim":             {"WF": True, "init_mutated": True},
     "recipe_init_mutated_nonWF.slim":          {"nonWF": True, "init_mutated": True},
-    "recipe_with_metadata.slim":               {"special_metadata": True},
+    "recipe_with_metadata.slim":               {"user_metadata": True},
     "recipe_resettable_WF.slim":               {"WF": True, "resettable": True, "user_metadata": True},
     "recipe_resettable_nonWF.slim":            {"nonWF": True, "resettable": True, "user_metadata": True},
     "recipe_retain_everyone_WF_late.slim":     {"WF": True, "pedigree": True, "retained": True},
@@ -77,6 +77,9 @@
             d[f"remembered_{y}"] = True
         recipe_specs[f"recipe_record_everyone_{t}_{y}.slim"] = d
 
+# add the script name itself to the keys: this must come last!
+for k in recipe_specs:
+    recipe_specs[k][k] = True
 
 def recipe_eq(*keys, exclude=None):
     """

tests/test_metadata.py

@@ -204,7 +204,7 @@ def test_recover_metadata(self, recipe):
                 if k != 'description' or ts.metadata['SLiM'][k] != "":
                     assert ts.metadata['SLiM'][k] == md['SLiM'][k]
 
-    @pytest.mark.parametrize('recipe', recipe_eq("special_metadata"), indirect=True)
+    @pytest.mark.parametrize('recipe', recipe_eq("recipe_with_metadata.slim"), indirect=True)
     def test_user_metadata(self, recipe):
         for _, ts in recipe["ts"].items():
             md = ts.metadata["SLiM"]
@@ -214,7 +214,7 @@ def test_user_metadata(self, recipe):
                     "pi" : [3, 1, 4, 1, 5, 9]
                     }
 
-    @pytest.mark.parametrize('recipe', recipe_eq("special_metadata"), indirect=True)
+    @pytest.mark.parametrize('recipe', recipe_eq("recipe_with_metadata.slim"), indirect=True)
     def test_population_names(self, recipe):
         for _, ts in recipe["ts"].items():
             md = ts.metadata["SLiM"]