docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix semantic merge conflict. 

Signed-off-by: Ying Li <ying.li@docker.com>
This commit is contained in:
Ying Li 2015-12-11 17:35:25 -08:00
parent 4aa9239aaf
commit c0bf1a4a68
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/client_test.go
View File

@ -25,6 +25,7 @@ import (
"github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed" "github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/store" "github.com/docker/notary/tuf/store"
"github.com/docker/notary/tuf/validation"
"github.com/jfrazelle/go/canonical/json" "github.com/jfrazelle/go/canonical/json"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -921,7 +922,7 @@ func testPublishNoOneHasSnapshotKey(t *testing.T, rootType string) {
addTarget(t, repo, "v1", "../fixtures/intermediate-ca.crt") addTarget(t, repo, "v1", "../fixtures/intermediate-ca.crt")
err = repo.Publish() err = repo.Publish()
assert.Error(t, err) assert.Error(t, err)
assert.IsType(t, store.ErrInvalidOperation{}, err) assert.IsType(t, validation.ErrBadHierarchy{}, err)
} }
// If the snapshot metadata is corrupt, whether the client or server has the // If the snapshot metadata is corrupt, whether the client or server has the