Skip to content

Commit a758230

Browse files
thockinthockin
committed
Clean up submodule cases to be a bit more readable
1 parent 5121f92 commit a758230

File tree

1 file changed

+47
-47
lines changed

1 file changed

+47
-47
lines changed

‎test_e2e.sh

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2403,9 +2403,9 @@ function e2e::submodule_sync_default() {
24032403

24042404
git -C "$SUBMODULE" init -q -b "$MAIN_BRANCH"
24052405
config_repo "$SUBMODULE"
2406-
echo "submodule" > "$SUBMODULE/submodule"
2407-
git -C "$SUBMODULE" add submodule
2408-
git -C "$SUBMODULE" commit -aqm "init submodule file"
2406+
echo "submodule" > "$SUBMODULE/submodule.file"
2407+
git -C "$SUBMODULE" add submodule.file
2408+
git -C "$SUBMODULE" commit -aqm "init submodule.file"
24092409

24102410
# Init nested submodule repo
24112411
NESTED_SUBMODULE_REPO_NAME="nested-sub"
@@ -2414,12 +2414,12 @@ function e2e::submodule_sync_default() {
24142414

24152415
git -C "$NESTED_SUBMODULE" init -q -b "$MAIN_BRANCH"
24162416
config_repo "$NESTED_SUBMODULE"
2417-
echo "nested-submodule" > "$NESTED_SUBMODULE/nested-submodule"
2418-
git -C "$NESTED_SUBMODULE" add nested-submodule
2419-
git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule file"
2417+
echo "nested-submodule" > "$NESTED_SUBMODULE/nested-submodule.file"
2418+
git -C "$NESTED_SUBMODULE" add nested-submodule.file
2419+
git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule.file"
24202420

24212421
# Add submodule
2422-
git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE
2422+
git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE "$SUBMODULE_REPO_NAME"
24232423
git -C "$REPO" commit -aqm "add submodule"
24242424

24252425
GIT_SYNC \
@@ -2431,20 +2431,20 @@ function e2e::submodule_sync_default() {
24312431
wait_for_sync "${MAXWAIT}"
24322432
assert_link_exists "$ROOT/link"
24332433
assert_file_exists "$ROOT/link/file"
2434-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2435-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule" "submodule"
2434+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2435+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file" "submodule"
24362436
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 1
24372437

24382438
# Make change in submodule repo
2439-
echo "$FUNCNAME 2" > "$SUBMODULE/submodule"
2439+
echo "$FUNCNAME 2" > "$SUBMODULE/submodule.file"
24402440
git -C "$SUBMODULE" commit -qam "$FUNCNAME 2"
24412441
git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
24422442
git -C "$REPO" commit -qam "$FUNCNAME 2"
24432443
wait_for_sync "${MAXWAIT}"
24442444
assert_link_exists "$ROOT/link"
24452445
assert_file_exists "$ROOT/link/file"
2446-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2447-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule" "$FUNCNAME 2"
2446+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2447+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file" "$FUNCNAME 2"
24482448
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 2
24492449

24502450
# Move backward in submodule repo
@@ -2454,21 +2454,21 @@ function e2e::submodule_sync_default() {
24542454
wait_for_sync "${MAXWAIT}"
24552455
assert_link_exists "$ROOT/link"
24562456
assert_file_exists "$ROOT/link/file"
2457-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2458-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule" "submodule"
2457+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2458+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file" "submodule"
24592459
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 3
24602460

24612461
# Add nested submodule to submodule repo
2462-
git -C "$SUBMODULE" -c protocol.file.allow=always submodule add -q file://$NESTED_SUBMODULE
2462+
git -C "$SUBMODULE" -c protocol.file.allow=always submodule add -q file://$NESTED_SUBMODULE "$NESTED_SUBMODULE_REPO_NAME"
24632463
git -C "$SUBMODULE" commit -aqm "add nested submodule"
24642464
git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
24652465
git -C "$REPO" commit -qam "$FUNCNAME 4"
24662466
wait_for_sync "${MAXWAIT}"
24672467
assert_link_exists "$ROOT/link"
24682468
assert_file_exists "$ROOT/link/file"
2469-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2470-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule"
2471-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule" "nested-submodule"
2469+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2470+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule.file"
2471+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule.file" "nested-submodule"
24722472
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 4
24732473

24742474
# Remove nested submodule
@@ -2481,8 +2481,8 @@ function e2e::submodule_sync_default() {
24812481
wait_for_sync "${MAXWAIT}"
24822482
assert_link_exists "$ROOT/link"
24832483
assert_file_exists "$ROOT/link/file"
2484-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2485-
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule"
2484+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2485+
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule.file"
24862486
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 5
24872487

24882488
# Remove submodule
@@ -2493,7 +2493,7 @@ function e2e::submodule_sync_default() {
24932493
wait_for_sync "${MAXWAIT}"
24942494
assert_link_exists "$ROOT/link"
24952495
assert_file_exists "$ROOT/link/file"
2496-
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2496+
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
24972497
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 6
24982498

24992499
rm -rf $SUBMODULE
@@ -2514,10 +2514,10 @@ function e2e::submodule_sync_depth() {
25142514

25152515
# First sync
25162516
expected_depth="1"
2517-
echo "$FUNCNAME 1" > "$SUBMODULE/submodule"
2518-
git -C "$SUBMODULE" add submodule
2517+
echo "$FUNCNAME 1" > "$SUBMODULE/submodule.file"
2518+
git -C "$SUBMODULE" add submodule.file
25192519
git -C "$SUBMODULE" commit -aqm "submodule $FUNCNAME 1"
2520-
git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE
2520+
git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE "$SUBMODULE_REPO_NAME"
25212521
git -C "$REPO" config -f "$REPO/.gitmodules" "submodule.$SUBMODULE_REPO_NAME.shallow" true
25222522
git -C "$REPO" commit -qam "$FUNCNAME 1"
25232523

@@ -2530,8 +2530,8 @@ function e2e::submodule_sync_depth() {
25302530
&
25312531
wait_for_sync "${MAXWAIT}"
25322532
assert_link_exists "$ROOT/link"
2533-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2534-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule" "$FUNCNAME 1"
2533+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2534+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file" "$FUNCNAME 1"
25352535
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 1
25362536
depth=$(git -C "$ROOT/link" rev-list HEAD | wc -l)
25372537
if [[ $expected_depth != $depth ]]; then
@@ -2543,14 +2543,14 @@ function e2e::submodule_sync_depth() {
25432543
fi
25442544

25452545
# Move forward
2546-
echo "$FUNCNAME 2" > "$SUBMODULE/submodule"
2546+
echo "$FUNCNAME 2" > "$SUBMODULE/submodule.file"
25472547
git -C "$SUBMODULE" commit -aqm "submodule $FUNCNAME 2"
25482548
git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
25492549
git -C "$REPO" commit -qam "$FUNCNAME 2"
25502550
wait_for_sync "${MAXWAIT}"
25512551
assert_link_exists "$ROOT/link"
2552-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2553-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule" "$FUNCNAME 2"
2552+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2553+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file" "$FUNCNAME 2"
25542554
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 2
25552555
depth=$(git -C "$ROOT/link" rev-list HEAD | wc -l)
25562556
if [[ $expected_depth != $depth ]]; then
@@ -2567,8 +2567,8 @@ function e2e::submodule_sync_depth() {
25672567
git -C "$REPO" commit -qam "$FUNCNAME 3"
25682568
wait_for_sync "${MAXWAIT}"
25692569
assert_link_exists "$ROOT/link"
2570-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2571-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule" "$FUNCNAME 1"
2570+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2571+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file" "$FUNCNAME 1"
25722572
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 3
25732573
depth=$(git -C "$ROOT/link" rev-list HEAD | wc -l)
25742574
if [[ $expected_depth != $depth ]]; then
@@ -2592,8 +2592,8 @@ function e2e::submodule_sync_off() {
25922592

25932593
git -C "$SUBMODULE" init -q -b "$MAIN_BRANCH"
25942594
config_repo "$SUBMODULE"
2595-
echo "submodule" > "$SUBMODULE/submodule"
2596-
git -C "$SUBMODULE" add submodule
2595+
echo "submodule" > "$SUBMODULE/submodule.file"
2596+
git -C "$SUBMODULE" add submodule.file
25972597
git -C "$SUBMODULE" commit -aqm "init submodule file"
25982598

25992599
# Add submodule
@@ -2608,7 +2608,7 @@ function e2e::submodule_sync_off() {
26082608
--submodules=off \
26092609
&
26102610
wait_for_sync "${MAXWAIT}"
2611-
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2611+
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
26122612
rm -rf $SUBMODULE
26132613
}
26142614

@@ -2623,8 +2623,8 @@ function e2e::submodule_sync_shallow() {
26232623

26242624
git -C "$SUBMODULE" init -q -b "$MAIN_BRANCH"
26252625
config_repo "$SUBMODULE"
2626-
echo "submodule" > "$SUBMODULE/submodule"
2627-
git -C "$SUBMODULE" add submodule
2626+
echo "submodule" > "$SUBMODULE/submodule.file"
2627+
git -C "$SUBMODULE" add submodule.file
26282628
git -C "$SUBMODULE" commit -aqm "init submodule file"
26292629

26302630
# Init nested submodule repo
@@ -2634,14 +2634,14 @@ function e2e::submodule_sync_shallow() {
26342634

26352635
git -C "$NESTED_SUBMODULE" init -q -b "$MAIN_BRANCH"
26362636
config_repo "$NESTED_SUBMODULE"
2637-
echo "nested-submodule" > "$NESTED_SUBMODULE/nested-submodule"
2638-
git -C "$NESTED_SUBMODULE" add nested-submodule
2637+
echo "nested-submodule" > "$NESTED_SUBMODULE/nested-submodule.file"
2638+
git -C "$NESTED_SUBMODULE" add nested-submodule.file
26392639
git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule file"
2640-
git -C "$SUBMODULE" -c protocol.file.allow=always submodule add -q file://$NESTED_SUBMODULE
2640+
git -C "$SUBMODULE" -c protocol.file.allow=always submodule add -q file://$NESTED_SUBMODULE "$NESTED_SUBMODULE_REPO_NAME"
26412641
git -C "$SUBMODULE" commit -aqm "add nested submodule"
26422642

26432643
# Add submodule
2644-
git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE
2644+
git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE "$SUBMODULE_REPO_NAME"
26452645
git -C "$REPO" commit -aqm "add submodule"
26462646

26472647
GIT_SYNC \
@@ -2654,8 +2654,8 @@ function e2e::submodule_sync_shallow() {
26542654
wait_for_sync "${MAXWAIT}"
26552655
assert_link_exists "$ROOT/link"
26562656
assert_file_exists "$ROOT/link/file"
2657-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2658-
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule"
2657+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2658+
assert_file_absent "$ROOT/link/$SUBMODULE_REPO_NAME/$NESTED_SUBMODULE_REPO_NAME/nested-submodule.file"
26592659
rm -rf $SUBMODULE
26602660
rm -rf $NESTED_SUBMODULE
26612661
}
@@ -2671,14 +2671,14 @@ function e2e::submodule_sync_relative() {
26712671

26722672
git -C "$SUBMODULE" init -q -b "$MAIN_BRANCH"
26732673
config_repo "$SUBMODULE"
2674-
echo "submodule" > "$SUBMODULE/submodule"
2675-
git -C "$SUBMODULE" add submodule
2674+
echo "submodule" > "$SUBMODULE/submodule.file"
2675+
git -C "$SUBMODULE" add submodule.file
26762676
git -C "$SUBMODULE" commit -aqm "init submodule file"
26772677

26782678
# Add submodule
26792679
REL="$(realpath --relative-to "$REPO" "$WORK/$SUBMODULE_REPO_NAME")"
26802680
echo $REL
2681-
git -C "$REPO" -c protocol.file.allow=always submodule add -q "${REL}"
2681+
git -C "$REPO" -c protocol.file.allow=always submodule add -q "$REL" "$SUBMODULE_REPO_NAME"
26822682
git -C "$REPO" commit -aqm "add submodule"
26832683

26842684
GIT_SYNC \
@@ -2690,8 +2690,8 @@ function e2e::submodule_sync_relative() {
26902690
wait_for_sync "${MAXWAIT}"
26912691
assert_link_exists "$ROOT/link"
26922692
assert_file_exists "$ROOT/link/file"
2693-
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule"
2694-
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule" "submodule"
2693+
assert_file_exists "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file"
2694+
assert_file_eq "$ROOT/link/$SUBMODULE_REPO_NAME/submodule.file" "submodule"
26952695
assert_metric_eq "${METRIC_GOOD_SYNC_COUNT}" 1
26962696

26972697
rm -rf $SUBMODULE

0 commit comments

Comments
 (0)