Package: notary / 0.6.1~ds2-6

Metadata

Package Version Patches format
notary 0.6.1~ds2-6 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
006963f1ded582c2cc5f5eb4d48dc6089ce3229b.patch | (download)

utils/auth_test.go | 2 1 + 1 - 0 !
utils/http.go | 6 3 + 3 - 0 !
utils/http_test.go | 6 6 + 0 - 0 !
3 files changed, 10 insertions(+), 4 deletions(-)

 update docker/distribution to 2.7.1

Signed-off-by: Justin Cormack <justin.cormack@docker.com>


ed25519.patch | (download)

tuf/data/keys.go | 9 5 + 4 - 0 !
tuf/signed/verifiers.go | 12 6 + 6 - 0 !
tuf/utils/x509.go | 2 1 + 1 - 0 !
3 files changed, 12 insertions(+), 11 deletions(-)

 [patch] use golang/x/crypto for ed25519

This is now available in the official upstream packages, so stop
using independent implementation. Small changes in types.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

test nontest.patch | (download)

cmd/notary-signer/main_test.go | 1 1 + 0 - 0 !
storage/httpstore_test.go | 1 1 + 0 - 0 !
2 files changed, 2 insertions(+)

 disable failing tests.
~~~~
 FAIL: TestSetupCryptoServicesRethinkDBStoreConnectionFails (0.00s)
    main_test.go:139:
        Error Trace:    main_test.go:139
        Error:          "Error starting rethinkdb driver: gorethink: dial tcp: lookup host on [::1]:53: read udp [::1]:57648->[::1]:53: read: connection refused" does not contain "no such host"
        Test:           TestSetupCryptoServicesRethinkDBStoreConnectionFails
~~~~

~~~~
    TestNetworkError: httpstore_test.go:396:
                Error Trace:    httpstore_test.go:396
                Error:          Not equal:
                                expected: "GET https://auth.docker.io: abc:def:ghi"
                                actual  : "GET \"https://auth.docker.io\": abc:def:ghi"

0001 Call flag.Parse in testing.patch | (download)

cmd/notary/integration_test.go | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 [patch] call flag.parse() in testing.

Newer versions of `testing` require that flags are parsed in `TestMain`
before use, including for `go test` command line options.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

fix make test for go 1.13.patch | (download)

cmd/escrow/main.go | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix "make test" broken on go 1.13

This fixes the tests being broken on Go 1.13 and up, which is caused by a change
in Go 1.13: https://golang.org/doc/go1.13#testing

> Testing flags are now registered in the new Init function, which is invoked by
> the generated main function for the test. As a result, testing flags are now only
> registered when running a test binary, and packages that call flag.Parse during
> package initialization may cause tests to fail.

Before this change:

    make test

    ok  	github.com/theupdateframework/notary/client/changelist	(cached)
    flag provided but not defined: -test.testlogfile
    Usage of /var/folders/c_/vjh56sc12fd2b_q2n02_lt140000gn/T/go-build270388911/b229/escrow.test:
      -config string
        	path to configuration file; supported formats are JSON, YAML, and TOML (default "config.toml")
    ...
    FAIL
    make: *** [test] Error 1

With this patch applied, the test complete successfully

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
remove use of distributions old wrapped context.patch | (download)

utils/auth_test.go | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

 remove use of distributions old wrapped context

Signed-off-by: Justin Cormack <justin.cormack@docker.com>