mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-07 18:49:08 -06:00
Code Issues Packages Projects Releases 127 Wiki Activity

Tests of new env vars on merge

Browse Source
This commit is contained in:
Zach Musgrave
2023-09-26 12:00:00 -07:00
parent f560f890c1
commit f83fedf4fb
2 changed files with 77 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integration-tests/bats/commit.bats
View File

@@ -240,9 +240,9 @@ SQL
run dolt_log_in_PST
[[ ! "$output" =~ 'Tue Sep 26 12:34:56' ]] || false
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:34' dolt commit --allow-empty -m "empty commit"
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:45' dolt commit --allow-empty -m "empty commit"
run dolt_log_in_PST
[[ ! "$output" =~ 'Tue Sep 26 01:23:45' ]] || false
[[ "$output" =~ 'Tue Sep 26 01:23:45' ]] || false
run dolt_log_in_PST
[[ ! "$output" =~ 'Tue Sep 26 12:34:56' ]] || false
@@ -254,12 +254,12 @@ SQL
dolt branch b2
dolt checkout b1
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:34' dolt commit --allow-empty -m "empty commit"
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:45' dolt commit --allow-empty -m "empty commit"
get_head_commit
head1=`get_head_commit`
dolt checkout b2
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:34' dolt commit --allow-empty -m "empty commit"
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:45' dolt commit --allow-empty -m "empty commit"
get_head_commit
head2=`get_head_commit`

73
integration-tests/bats/merge.bats
View File

@@ -1086,3 +1086,76 @@ SQL
[ $status -eq 0 ]
[[ "$output" =~ "2 tables changed, 3 rows added(+), 1 rows modified(*), 1 rows deleted(-)" ]] || false
}
@test "merge: setting DOLT_AUTHOR_DATE" {
dolt sql -q "CREATE table t (pk int primary key, col1 int);"
dolt sql -q "INSERT INTO t VALUES (1, 1), (2, 2);"
dolt commit -Am "add table t"
dolt checkout -b right
dolt sql -q "insert into t values (3, 3), (4, 4);"
dolt sql -q "delete from t where pk = 1;"
dolt commit -Am "right"
dolt checkout main
dolt sql -q "insert into t values (5, 5);"
dolt commit -Am "left"
TZ=PST+8 DOLT_AUTHOR_DATE='2023-09-26T01:23:45' dolt merge right -m "merge right into main"
run dolt_log_in_PST
[[ "$output" =~ 'Tue Sep 26 01:23:45' ]] || false
}
@test "merge: setting DOLT_AUTHOR_DATE and DOLT_COMMITTER_DATE" {
dolt sql -q "CREATE table t (pk int primary key, col1 int);"
dolt sql -q "INSERT INTO t VALUES (1, 1), (2, 2);"
dolt commit -Am "add table t"
dolt remote add local file://./remote
dolt push local main
dolt checkout -b right
dolt sql -q "insert into t values (3, 3), (4, 4);"
dolt sql -q "delete from t where pk = 1;"
dolt commit -Am "right"
dolt push local right
dolt checkout main
dolt sql -q "insert into t values (5, 5);"
dolt commit -Am "left"
dolt push local main
# We don't have any way to print the committer time of a commit, so instead we'll do the merge
# here and on a clone and assert that they get the same hash
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:45' dolt merge right -m "merge right into main"
run dolt_log_in_PST
[[ "$output" =~ 'Tue Sep 26 01:23:45' ]] || false
head1=`get_head_commit`
dolt clone file://./remote clone
cd clone
dolt fetch
dolt checkout right
dolt checkout main
TZ=PST+8 DOLT_COMMITTER_DATE='2023-09-26T12:34:56' DOLT_AUTHOR_DATE='2023-09-26T01:23:45' dolt merge right -m "merge right into main"
run dolt_log_in_PST
[[ "$output" =~ 'Tue Sep 26 01:23:45' ]] || false
head2=`get_head_commit`
[ "$head1" == "$head2" ]
}
dolt_log_in_PST() {
TZ=PST+8 dolt log -n1
}
get_head_commit() {
dolt log -n 1 | grep -m 1 commit | awk '{print $2}'
}