mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-21 11:39:10 -05:00
Code Issues Packages Projects Releases 168 Wiki Activity

fixup bats

Browse Source
This commit is contained in:
Andy Arthur
2022-10-07 13:05:28 -07:00
parent f98e58cd4f
commit af93cfd6a5
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/env/multi_repo_env.go
Vendored
+2 -5
View File
@@ -273,11 +273,11 @@ func MultiEnvForDirectory(
envSet := map[string]*DoltEnv{}
if dEnv.Valid() {
mrEnv.AddEnv(dbName, dEnv)
envSet[dbName] = dEnv
}
// If there are other directories in the directory, try to load them as additional databases
err := fs.Iter(".", false, func(path string, size int64, isDir bool) (stop bool) {
fs.Iter(".", false, func(path string, size int64, isDir bool) (stop bool) {
if !isDir {
return false
}
@@ -295,9 +295,6 @@ func MultiEnvForDirectory(
}
return false
})
if err != nil {
return nil, err
}
enforceSingleFormat(envSet)
for dbName, dEnv = range envSet {
integration-tests/bats/init.bats
+2 -4
View File
@@ -251,10 +251,9 @@ teardown() {
}
@test "init: create a database when current working directory does not have a database yet" {
# it creates old format even though there is new format db exists in the current directory.
set_dolt_user "baz", "baz@bash.com"
# Default format is OLD (__LD_1__) when DOLT_DEFAULT_BIN_FORMAT is undefined
# Default format is NEW (__DOLT__) when DOLT_DEFAULT_BIN_FORMAT is undefined
if [ "$DOLT_DEFAULT_BIN_FORMAT" = "" ]
then
orig_bin_format="__DOLT__"
@@ -281,10 +280,9 @@ teardown() {
[[ $output =~ "test" ]] || false
cd test
dolt version
run dolt version
[ "$status" -eq 0 ]
[[ "$output" =~ "$orig_bin_format" ]] || false
[[ "$output" =~ "__DOLT__" ]] || false
}
assert_valid_repository () {