Merge branch 'baserock/richardmaw/S10166/test-key-collision-with-artifact-names-v2' of git://git.baserock.org/baserock/baserock/morph

Reviewed-by: Lars Wirzenius

1 files changed, 2 insertions, 15 deletions

diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn
index e55d5ed0..40da5fb4 100644
--- a/yarns/splitting.yarn
+++ b/yarns/splitting.yarn
@@ -40,7 +40,7 @@ libraries.
 The only change we need to make is to add a field to the system morphology
 to select which artifact to use in the system.
 
-    AND system test-system only uses test-stratum-runtime from test-stratum
+    AND system test-system uses test-stratum-runtime from test-stratum
     WHEN the user checks out the system branch called master
 
 The best way to test that only using some stratum artifacts works is
@@ -75,7 +75,7 @@ so we know that if the system successfully builds, then we only built
 chunks that were needed.
 
     AND stratum test-stratum has chunks that aren't used in test-stratum-minimal
-    AND system test-system only uses test-stratum-minimal from test-stratum
+    AND system test-system uses test-stratum-minimal from test-stratum
     WHEN the user checks out the system branch called master
     THEN morph build the system test-system of the branch master
 
@@ -168,19 +168,6 @@ Implementations
     run_in "$DATADIR/gits/morphs" git add "$MATCH_1.morph"
     run_in "$DATADIR/gits/morphs" git commit -m 'Add default splitting rules'
 
-    IMPLEMENTS GIVEN system (\S+) only uses (\S+) from (\S+)
-    python -c 'import sys, yaml
-    with open(sys.argv[1], "r") as f:
-        d = yaml.load(f)
-    for spec in d["strata"]:
-        if spec["name"] == sys.argv[3]:
-            spec["artifacts"] = [sys.argv[2]]
-    with open(sys.argv[1], "w") as f:
-        yaml.dump(d, f)
-    ' "$DATADIR/gits/morphs/$MATCH_1.morph" "$MATCH_2" "$MATCH_3"
-    run_in "$DATADIR/gits/morphs" git add "$MATCH_1.morph"
-    run_in "$DATADIR/gits/morphs" git commit -m "Make $MATCH_1 only use $MATCH_2"
-
     IMPLEMENTS GIVEN stratum (\S+) has chunks that aren't used in (\1-\S+)
     # Create an extra chunk that will never successfully build
     cat >"$DATADIR/gits/test-chunk/unbuildable-chunk.morph" <<EOF