Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

Commit

Permalink
test: port interop tests to interop repo (#1157)
Browse files Browse the repository at this point in the history
* port interop tests to interop repo

* fix
  • Loading branch information
daviddias authored Dec 18, 2017
1 parent 1914da5 commit 9e61377
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 1,207 deletions.
8 changes: 0 additions & 8 deletions .aegir.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const parallel = require('async/parallel')
const ads = require('./test/utils/another-daemon-spawner')
const js = ads.spawnJsNode
const go = ads.spawnGoNode
const stop = ads.stopNodes

/*
Expand All @@ -20,13 +19,6 @@ function start (done) {
(cb) => js([`${base}/10014`, `${base}/20014/ws`], true, 31014, 32014, cb),
(cb) => js([`${base}/10015`, `${base}/20015/ws`], true, 31015, 32015, cb)
], done)
} else if (process.env.IPFS_TEST === 'interop') {
parallel([
(cb) => go([`${base}/10027`, `${base}/20027/ws`], true, 33027, 44027, cb),
(cb) => go([`${base}/10028`, `${base}/20028/ws`], true, 33028, 44028, cb),
(cb) => go([`${base}/10031`, `${base}/20031/ws`], true, 33031, 44031, cb),
(cb) => go([`${base}/10032`, `${base}/20032/ws`], true, 33032, 44032, cb)
], done)
} else if (process.env.IPFS_TEST === 'bootstrapers') {
done()
}
Expand Down
33 changes: 11 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<a href=""><img src="https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square" /></a>
<a href=""><img src="https://img.shields.io/badge/Node.js-%3E%3D6.0.0-orange.svg?style=flat-square" /></a>
<br>
<!-- Hidding this until we have SauceLabs situation figured out, right now it is just misleading
<a href="https://saucelabs.com/u/js-ipfs"><img src="https://saucelabs.com/browser-matrix/js-ipfs.svg" /></a> -->
</p>

### Project status
Expand Down Expand Up @@ -494,51 +492,42 @@ A way to mitigate this in Chrome, is to run your IPFS node inside a Service Work
> npm test

# run just IPFS tests in Node.js
> npm run test:unit:node:core
> npm run test:node:core

# run just IPFS core tests
> npm run test:unit:node:core
> npm run test:node:core

# run just IPFS HTTP-API tests
> npm run test:unit:node:http
> npm run test:node:http

# run just IPFS CLI tests
> npm run test:unit:node:cli
> npm run test:node:cli

# run just IPFS core tests in the Browser (Chrome)
> npm run test:unit:browser
> npm run test:browser
```

### Run interop tests

```sh
# run all the interop tsts
> npm run test:interop

# run just IPFS interop tests in Node.js using one go-ipfs daemon and one js-ipfs daemon
> npm run test:interop:node

# run just IPFS interop testsin the Browser (Chrome) using one instance in the browser and one go-ipfs daemon
> npm run test:interop:browser
```
Run the interop tests with https://github.com/ipfs/interop

### Run benchmark tests

```sh
# run all the benchmark tests
> npm run test:benchmark
> npm run benchmark

# run just IPFS benchmarks in Node.js
> npm run test:benchmark:node
> npm run benchmark:node

# run just IPFS benchmarks in Node.js for an IPFS instance
> npm run test:benchmark:node:core
> npm run benchmark:node:core

# run just IPFS benchmarks in Node.js for an IPFS daemon
> npm run test:benchmark:node:http
> npm run benchmark:node:http

# run just IPFS benchmarks in the browser (Chrome)
> npm run test:benchmark:browser
> npm run benchmark:browser
```

### Lint
Expand Down
28 changes: 12 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,21 @@
"test": "aegir test -t node -t browser --no-cors",
"test:node": "aegir test -t node",
"test:browser": "aegir test -t browser -t webworker --no-cors",
"test:node": "aegir test -t node",
"test:node:core": "aegir test -t node -f test/core/**.js",
"test:node:http": "aegir test -t node -f test/http-api/index.js",
"test:node:gateway": "aegir test -t node -f test/gateway/index.js",
"test:node:cli": "aegir test -t node -f test/cli/index.js",
"test:browser": "aegir test -t browser --no-cors",
"test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
"benchmark": "echo \"Error: no benchmarks yet\" && exit 1",
"benchmark:node": "echo \"Error: no benchmarks yet\" && exit 1",
"benchmark:node:core": "echo \"Error: no benchmarks yet\" && exit 1",
"benchmark:node:http": "echo \"Error: no benchmarks yet\" && exit 1",
"benchmark:browser": "echo \"Error: no benchmarks yet\" && exit 1",
"release": "aegir release -t node -t browser",
"release-minor": "aegir release --type minor -t node -t browser",
"release-major": "aegir release --type major -t node -t browser",
"test:unit:node": "aegir test -t node",
"test:unit:node:core": "aegir test -t node -f test/core/**.js",
"test:unit:node:http": "aegir test -t node -f test/http-api/index.js",
"test:unit:node:gateway": "aegir test -t node -f test/gateway/index.js",
"test:unit:node:cli": "aegir test -t node -f test/cli/index.js",
"test:unit:browser": "aegir test -t browser --no-cors",
"test:interop": "IPFS_TEST=interop aegir test -t node -f test/interop",
"test:interop:node": "IPFS_TEST=interop aegir test -t node -f test/interop/node.js",
"test:interop:browser": "IPFS_TEST=interop aegir test -t browser -f test/interop/browser.js",
"test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
"test:benchmark": "echo \"Error: no benchmarks yet\" && exit 1",
"test:benchmark:node": "echo \"Error: no benchmarks yet\" && exit 1",
"test:benchmark:node:core": "echo \"Error: no benchmarks yet\" && exit 1",
"test:benchmark:node:http": "echo \"Error: no benchmarks yet\" && exit 1",
"test:benchmark:browser": "echo \"Error: no benchmarks yet\" && exit 1",
"coverage": "aegir coverage",
"coverage-publish": "aegir-coverage publish"
},
Expand Down Expand Up @@ -76,7 +73,6 @@
"form-data": "^2.3.1",
"hat": "0.0.3",
"interface-ipfs-core": "~0.36.15",
"ipfsd-ctl": "~0.26.0",
"left-pad": "^1.2.0",
"lodash": "^4.17.4",
"mocha": "^4.0.1",
Expand Down
10 changes: 0 additions & 10 deletions test/interop/browser.js

This file was deleted.

167 changes: 0 additions & 167 deletions test/interop/circuit-relay.js

This file was deleted.

Loading

0 comments on commit 9e61377

Please sign in to comment.