docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #360 from docker/fix-merge-conflict

Browse Source 
Fix semantic merge conflict.
This commit is contained in:
Diogo Mónica
2015-12-14 09:32:19 -08:00
parent 4aa9239aaf c0bf1a4a68
commit ad1fd268af
1 changed files with 2 additions and 1 deletions
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/signed"
"github.com/docker/notary/tuf/store"
"github.com/docker/notary/tuf/validation"
"github.com/jfrazelle/go/canonical/json"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
@@ -921,7 +922,7 @@ func testPublishNoOneHasSnapshotKey(t *testing.T, rootType string) {
addTarget(t, repo, "v1", "../fixtures/intermediate-ca.crt")
err = repo.Publish()
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