adjust appdb.js and unit tests to support memoryLimit

This commit is contained in:
Johannes Zellner
2016-02-05 15:04:03 +01:00
parent 2d60901b6e
commit ab003bf81f
2 changed files with 15 additions and 10 deletions

View File

@@ -479,7 +479,8 @@ describe('database', function () {
oauthProxy: false,
lastBackupId: null,
lastBackupConfig: null,
oldConfig: null
oldConfig: null,
memoryLimit: 4294967296
};
var APP_1 = {
id: 'appid-1',
@@ -498,7 +499,8 @@ describe('database', function () {
oauthProxy: true,
lastBackupId: null,
lastBackupConfig: null,
oldConfig: null
oldConfig: null,
memoryLimit: 0
};
it('add fails due to missing arguments', function () {
@@ -515,7 +517,7 @@ describe('database', function () {
});
it('add succeeds', function (done) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, function (error) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit, function (error) {
expect(error).to.be(null);
done();
});
@@ -539,7 +541,7 @@ describe('database', function () {
});
it('add of same app fails', function (done) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, [ ], APP_0.accessRestriction, APP_0.oauthProxy, function (error) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, [ ], APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit, function (error) {
expect(error).to.be.a(DatabaseError);
expect(error.reason).to.be(DatabaseError.ALREADY_EXISTS);
done();
@@ -571,6 +573,7 @@ describe('database', function () {
APP_0.accessRestriction = '';
APP_0.oauthProxy = true;
APP_0.httpPort = 1337;
APP_0.memoryLimit = 1337;
var data = {
installationState: APP_0.installationState,
@@ -578,7 +581,8 @@ describe('database', function () {
manifest: APP_0.manifest,
accessRestriction: APP_0.accessRestriction,
oauthProxy: APP_0.oauthProxy,
httpPort: APP_0.httpPort
httpPort: APP_0.httpPort,
memoryLimit: APP_0.memoryLimit
};
appdb.update(APP_0.id, data, function (error) {
@@ -611,7 +615,7 @@ describe('database', function () {
});
it('add second app succeeds', function (done) {
appdb.add(APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, [ ], APP_1.accessRestriction, APP_0.oauthProxy, function (error) {
appdb.add(APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, [ ], APP_1.accessRestriction, APP_0.oauthProxy, APP_1.memoryLimit, function (error) {
expect(error).to.be(null);
done();
});