mirror of
https://github.com/dolthub/dolt.git
synced 2026-01-31 12:19:08 -06:00
f47d117bf2
In addition to putting in the 'pull' tool that I forgot to add in my initial PR, I added an extra unit test to cover a case that we found to be buggy, as well as addressing some comments by aa and arv. 1) Switched to io.Copy in CopyChunks 2) Added NewFlagsWithPrefix() 3) Cleaned up some error reporting
89 lines
2.4 KiB
Go
89 lines
2.4 KiB
Go
package sync
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/attic-labs/noms/chunks"
|
|
"github.com/attic-labs/noms/datas"
|
|
"github.com/attic-labs/noms/dataset"
|
|
"github.com/attic-labs/noms/types"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func createTestDataset(name string) dataset.Dataset {
|
|
t := &chunks.TestStore{}
|
|
return dataset.NewDataset(datas.NewDataStore(t, t), name)
|
|
|
|
}
|
|
|
|
func TestValidateRef(t *testing.T) {
|
|
cs := &chunks.TestStore{}
|
|
r, err := types.WriteValue(types.Bool(true), cs)
|
|
assert.NoError(t, err)
|
|
|
|
_, err = validateRefAsSetOfCommit(r, cs)
|
|
assert.Error(t, err)
|
|
}
|
|
|
|
func TestPull(t *testing.T) {
|
|
assert := assert.New(t)
|
|
|
|
puller := createTestDataset("puller")
|
|
pullee := createTestDataset("pullee")
|
|
|
|
commitValue := func(v types.Value, ds dataset.Dataset) dataset.Dataset {
|
|
return ds.Commit(
|
|
datas.NewSetOfCommit().Insert(
|
|
datas.NewCommit().SetParents(ds.Heads().NomsValue()).SetValue(v)))
|
|
}
|
|
|
|
initialValue := types.NewMap(
|
|
types.NewString("first"), types.NewList(),
|
|
types.NewString("second"), types.NewList(types.Int32(2)))
|
|
|
|
pullee = commitValue(initialValue, pullee)
|
|
puller = commitValue(initialValue, puller)
|
|
|
|
updatedValue := initialValue.Set(
|
|
types.NewString("third"), types.NewList(types.Int32(1)))
|
|
|
|
pullee = commitValue(updatedValue, pullee)
|
|
|
|
refs, err := DiffHeadsByRef(puller.Heads().Ref(), pullee.Heads().Ref(), pullee)
|
|
assert.NoError(err)
|
|
assert.NoError(CopyChunks(refs, pullee, puller))
|
|
puller, err = SetNewHeads(pullee.Heads().Ref(), puller)
|
|
assert.NoError(err)
|
|
assert.Equal(pullee.Heads().Ref(), puller.Heads().Ref())
|
|
assert.True(pullee.Heads().Equals(puller.Heads()))
|
|
|
|
}
|
|
|
|
func TestPullFirstCommit(t *testing.T) {
|
|
assert := assert.New(t)
|
|
|
|
puller := createTestDataset("puller")
|
|
pullee := createTestDataset("pullee")
|
|
|
|
commitValue := func(v types.Value, ds dataset.Dataset) dataset.Dataset {
|
|
return ds.Commit(
|
|
datas.NewSetOfCommit().Insert(
|
|
datas.NewCommit().SetParents(ds.Heads().NomsValue()).SetValue(v)))
|
|
}
|
|
|
|
initialValue := types.NewMap(
|
|
types.NewString("first"), types.NewList(),
|
|
types.NewString("second"), types.NewList(types.Int32(2)))
|
|
|
|
pullee = commitValue(initialValue, pullee)
|
|
|
|
refs, err := DiffHeadsByRef(puller.Heads().Ref(), pullee.Heads().Ref(), pullee)
|
|
assert.NoError(err)
|
|
assert.NoError(CopyChunks(refs, pullee, puller))
|
|
puller, err = SetNewHeads(pullee.Heads().Ref(), puller)
|
|
assert.NoError(err)
|
|
assert.Equal(pullee.Heads().Ref(), puller.Heads().Ref())
|
|
assert.True(pullee.Heads().Equals(puller.Heads()))
|
|
|
|
}
|