Fixup the merge

This commit is contained in:
Johannes Zellner
2016-02-10 12:28:57 +01:00
parent 1cdb64e78d
commit 1b7265f866
7 changed files with 32 additions and 22 deletions

View File

@@ -196,7 +196,8 @@ describe('updatechecker - checkAppUpdates', function () {
portBindings: { PORT: 5678 },
healthy: null,
accessRestriction: null,
oauthProxy: false
oauthProxy: false,
memoryLimit: 0
};
before(function (done) {
@@ -205,7 +206,7 @@ describe('updatechecker - checkAppUpdates', function () {
async.series([
database.initialize,
database._clear,
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy)
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit)
], done);
});