jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove docker proxy from tests

Browse Source 
this is too complicated and also makes it hard to keep up with upstream API
This commit is contained in:
Girish Ramakrishnan
2019-08-19 14:35:23 -07:00
parent b301e5b151
commit 43bf0767f1
2 changed files with 3 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/ldap-test.js
+2 -65
View File
@@ -8,7 +8,6 @@
var appdb = require('../appdb.js'),
apps = require('../apps.js'),
assert = require('assert'),
async = require('async'),
constants = require('../constants.js'),
database = require('../database.js'),
@@ -16,7 +15,6 @@ var appdb = require('../appdb.js'),
EventEmitter = require('events').EventEmitter,
expect = require('expect.js'),
groups = require('../groups.js'),
http = require('http'),
ldapServer = require('../ldap.js'),
maildb = require('../maildb.js'),
mailboxdb = require('../mailboxdb.js'),
@@ -82,15 +80,6 @@ var APP_0 = {
mailboxName: 'some-location-0.app'
};
var dockerProxy;
function startDockerProxy(interceptor, callback) {
assert.strictEqual(typeof interceptor, 'function');
assert.strictEqual(typeof callback, 'function');
return http.createServer(interceptor).listen(5687, callback);
}
function setup(done) {
async.series([
database.initialize.bind(null),
@@ -148,57 +137,7 @@ function setup(done) {
groups.addMember.bind(null, GROUP_ID, USER_1.id)
], callback);
}
], function (error) {
if (error) return done(error);
dockerProxy = startDockerProxy(function interceptor(req, res) {
var answer = {};
var status = 500;
if (req.method === 'GET' && req.url === '/networks/cloudron') {
answer = {
Name: 'cloudron',
Id: 'f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566',
Scope: 'local',
Driver: 'bridge',
IPAM: {
Driver: 'default',
Config: [{
Subnet: '172.18.0.0/16'
}]
},
'Containers': {
someOtherContainerId: {
'EndpointID': 'ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda',
'MacAddress': '02:42:ac:11:00:02',
'IPv4Address': '127.0.0.2/16',
'IPv6Address': ''
},
someContainerId: {
'EndpointID': 'ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda',
'MacAddress': '02:42:ac:11:00:02',
'IPv4Address': '127.0.0.1/16',
'IPv6Address': ''
}
}
};
status = 200;
} else if (req.method === 'GET' && req.url === '/containers/someContainerId/json') {
answer = {
Config: {
Labels: {
appId: APP_0.id
}
}
};
status = 200;
}
res.writeHead(status);
res.write(JSON.stringify(answer));
res.end();
}, done);
});
], done);
}
function cleanup(done) {
@@ -206,9 +145,7 @@ function cleanup(done) {
ldapServer.stop,
database._clear,
database.uninitialize
], function () {
dockerProxy.close(function () { done(); }); // some strange error
});
], done);
}
describe('Ldap', function () {