Mise à jour de GitLab prévue ce samedi 23 octobre 2021 à partir de 9h00 CET

Commit a21ed389 authored by Éloïs's avatar Éloïs
Browse files

[fix] ws2p integrations test : use different uuidfor each testing server

parent de0c6916
......@@ -9,6 +9,7 @@ import {
} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
import {hashf} from "../../app/lib/common";
const assert = require('assert')
......@@ -112,7 +113,7 @@ describe("WS2P client limitations", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
'WS2P 11111111 127.0.0.1 ' + portWS1
'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
await (s1._server.ws2pCluster as WS2PCluster).startCrawling(true)
......@@ -231,7 +232,7 @@ describe("WS2P client limitations", function() {
// A server
conf1.ws2p = {
upnp: false,
uuid: '11111111',
uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
......@@ -239,7 +240,7 @@ describe("WS2P client limitations", function() {
privilegedNodes: []
}
const server = simpleTestingServer(conf1)
server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})
......@@ -8,6 +8,7 @@ import {
} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
import {hashf} from "../../app/lib/common";
const assert = require('assert')
......@@ -89,7 +90,7 @@ describe("WS2P cluster", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
'WS2P 11111111 127.0.0.1 ' + portWS1
'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
WS2PCluster.plugOn(s2._server);
......@@ -144,14 +145,14 @@ describe("WS2P cluster", function() {
// A server
conf1.ws2p = {
upnp: false,
uuid: '11111111',
uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
remoteport: portWS
}
const server = simpleTestingServer(conf1)
server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})
import {getNewTestingPort, simpleTestingConf, simpleTestingServer, simpleUser, TestingServer} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
import {hashf} from "../../app/lib/common";
const assert = require('assert')
const should = require('should')
......@@ -67,7 +68,7 @@ describe("WS2P heads propagation", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
'WS2P 11111111 127.0.0.1 ' + portWS1
'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
await (s1._server.ws2pCluster as WS2PCluster).startCrawling(true)
......@@ -110,7 +111,7 @@ describe("WS2P heads propagation", function() {
// A server
conf1.ws2p = {
upnp: false,
uuid: '11111111',
uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
......@@ -118,7 +119,7 @@ describe("WS2P heads propagation", function() {
privilegedNodes: []
}
const server = simpleTestingServer(conf1)
server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})
......@@ -9,6 +9,7 @@ import {
} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
import {hashf} from "../../app/lib/common";
const assert = require('assert')
......@@ -115,7 +116,7 @@ describe("WS2P server limitations", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
'WS2P 11111111 127.0.0.1 ' + portWS1
'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
await (s1._server.ws2pCluster as WS2PCluster).startCrawling(true)
......@@ -208,7 +209,7 @@ describe("WS2P server limitations", function() {
// A server
conf1.ws2p = {
upnp: false,
uuid: '11111111',
uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
......@@ -216,7 +217,7 @@ describe("WS2P server limitations", function() {
privilegedNodes: []
}
const server = simpleTestingServer(conf1)
server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment