Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,25 @@ services:

env:
global:
- GO111MODULE=on
- GOTFLAGS="-race"
- IPFS_PATH=/tmp/ipfs
matrix:
- BUILD_DEPTYPE=gx
- BUILD_DEPTYPE=gomod

before_install:
- docker pull ipfs/go-ipfs:master
- mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs
- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master --enable-pubsub-experiment


# disable travis install
- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master "daemon" "--enable-namesys-pubsub"

install:
- true
- go mod download

before_script:
- go vet ./...

script:
- go get -d -t github.com/cheekybits/is/... # remove with gx
- go get -d github.com/cheekybits/is/... # remove with gx
- bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)


Expand Down
6 changes: 3 additions & 3 deletions shell_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestAdd(t *testing.T) {
is.Equal(mhash, "QmUfZ9rAdhV5ioBzXKdUTh2ZNsz9bzbkaLVyQ8uc8pj21F")
mhash, err = s.Add(bytes.NewBufferString("Hello IPFS Shell tests"), Hash("sha3-256"))
is.Nil(err)
is.Equal(mhash, "zb2wwqxjxosf8GKEZCwAWSFZ879XFNca3De5yAoh5b2axAffc")
is.Equal(mhash, "bafkrmidz7cuqruceo2hocadpdjppcsi7qw6dypz3jhsae2qda6sexdk6z4")
}

func TestRedirect(t *testing.T) {
Expand Down Expand Up @@ -330,7 +330,7 @@ func TestDagPut(t *testing.T) {

c, err := s.DagPut(`{"x": "abc","y":"def"}`, "json", "cbor")
is.Nil(err)
is.Equal(c, "zdpuAt47YjE9XTgSxUBkiYCbmnktKajQNheQBGASHj3FfYf8M")
is.Equal(c, "bafyreidrm3r2k6vlxqp2fk47sboeycf7apddib47w7cyagrajtpaxxl2pi")
}

func TestDagPutWithOpts(t *testing.T) {
Expand All @@ -339,7 +339,7 @@ func TestDagPutWithOpts(t *testing.T) {

c, err := s.DagPutWithOpts(`{"x": "abc","y":"def"}`, options.Dag.Pin("true"))
is.Nil(err)
is.Equal(c, "zdpuAt47YjE9XTgSxUBkiYCbmnktKajQNheQBGASHj3FfYf8M")
is.Equal(c, "bafyreidrm3r2k6vlxqp2fk47sboeycf7apddib47w7cyagrajtpaxxl2pi")
}

func TestStatsBW(t *testing.T) {
Expand Down