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

fixing use of require vs assert 

Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence 2016-01-13 15:59:33 -08:00
parent 26d3f3f92b
commit a60f228189
1 changed files with 14 additions and 14 deletions

28
client/client_test.go
View File

@ -2407,7 +2407,7 @@ func TestRemoveDelegationErrorWritingChanges(t *testing.T) {
// a TUF server // a TUF server
func TestBootstrapClientBadURL(t *testing.T) { func TestBootstrapClientBadURL(t *testing.T) {
tempBaseDir, err := ioutil.TempDir("", "notary-test-") tempBaseDir, err := ioutil.TempDir("", "notary-test-")
require.NoError(t, err, "failed to create a temporary directory: %s", err) assert.NoError(t, err, "failed to create a temporary directory: %s", err)
repo, err := NewNotaryRepository( repo, err := NewNotaryRepository(
tempBaseDir, tempBaseDir,
"testGun", "testGun",
@ -2415,20 +2415,20 @@ func TestBootstrapClientBadURL(t *testing.T) {
http.DefaultTransport, http.DefaultTransport,
passphraseRetriever, passphraseRetriever,
) )
require.NoError(t, err, "error creating repo: %s", err) assert.NoError(t, err, "error creating repo: %s", err)
c, err := repo.bootstrapClient(false) c, err := repo.bootstrapClient(false)
require.Nil(t, c) assert.Nil(t, c)
require.Error(t, err) assert.Error(t, err)
c, err2 := repo.bootstrapClient(true) c, err2 := repo.bootstrapClient(true)
require.Nil(t, c) assert.Nil(t, c)
require.Error(t, err2) assert.Error(t, err2)
// same error should be returned because we don't have local data // same error should be returned because we don't have local data
// and are requesting remote root regardless of checkInitialized // and are requesting remote root regardless of checkInitialized
// value // value
require.EqualError(t, err, err2.Error()) assert.EqualError(t, err, err2.Error())
} }
// TestBootstrapClientInvalidURL checks that bootstrapClient correctly // TestBootstrapClientInvalidURL checks that bootstrapClient correctly
@ -2436,7 +2436,7 @@ func TestBootstrapClientBadURL(t *testing.T) {
// a TUF server // a TUF server
func TestBootstrapClientInvalidURL(t *testing.T) { func TestBootstrapClientInvalidURL(t *testing.T) {
tempBaseDir, err := ioutil.TempDir("", "notary-test-") tempBaseDir, err := ioutil.TempDir("", "notary-test-")
require.NoError(t, err, "failed to create a temporary directory: %s", err) assert.NoError(t, err, "failed to create a temporary directory: %s", err)
repo, err := NewNotaryRepository( repo, err := NewNotaryRepository(
tempBaseDir, tempBaseDir,
"testGun", "testGun",
@ -2444,18 +2444,18 @@ func TestBootstrapClientInvalidURL(t *testing.T) {
http.DefaultTransport, http.DefaultTransport,
passphraseRetriever, passphraseRetriever,
) )
require.NoError(t, err, "error creating repo: %s", err) assert.NoError(t, err, "error creating repo: %s", err)
c, err := repo.bootstrapClient(false) c, err := repo.bootstrapClient(false)
require.Nil(t, c) assert.Nil(t, c)
require.Error(t, err) assert.Error(t, err)
c, err2 := repo.bootstrapClient(true) c, err2 := repo.bootstrapClient(true)
require.Nil(t, c) assert.Nil(t, c)
require.Error(t, err2) assert.Error(t, err2)
// same error should be returned because we don't have local data // same error should be returned because we don't have local data
// and are requesting remote root regardless of checkInitialized // and are requesting remote root regardless of checkInitialized
// value // value
require.EqualError(t, err, err2.Error()) assert.EqualError(t, err, err2.Error())
} }