Add format to backupsdb

Call remove/removeDir based on the format
This commit is contained in:
Girish Ramakrishnan
2017-09-27 17:34:49 -07:00
parent aa8ce2c62e
commit a34180c27b
12 changed files with 194 additions and 82 deletions
+12 -7
View File
@@ -7,7 +7,6 @@
'use strict';
var async = require('async'),
appdb = require('../appdb.js'),
backupdb = require('../backupdb.js'),
backups = require('../backups.js'),
database = require('../database'),
@@ -46,7 +45,8 @@ describe('backups', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_BOX,
dependsOn: [ 'backup-app-00', 'backup-app-01' ],
restoreConfig: null
restoreConfig: null,
format: 'tgz'
};
var BACKUP_0_APP_0 = {
@@ -54,7 +54,8 @@ describe('backups', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_APP,
dependsOn: [],
restoreConfig: null
restoreConfig: null,
format: 'tgz'
};
var BACKUP_0_APP_1 = {
@@ -62,7 +63,8 @@ describe('backups', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_APP,
dependsOn: [],
restoreConfig: null
restoreConfig: null,
format: 'tgz'
};
var BACKUP_1 = {
@@ -70,7 +72,8 @@ describe('backups', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_BOX,
dependsOn: [ 'backup-app-10', 'backup-app-11' ],
restoreConfig: null
restoreConfig: null,
format: 'tgz'
};
var BACKUP_1_APP_0 = {
@@ -78,7 +81,8 @@ describe('backups', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_APP,
dependsOn: [],
restoreConfig: null
restoreConfig: null,
format: 'tgz'
};
var BACKUP_1_APP_1 = {
@@ -86,7 +90,8 @@ describe('backups', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_APP,
dependsOn: [],
restoreConfig: null
restoreConfig: null,
format: 'tgz'
};
it('succeeds without backups', function (done) {
+4 -2
View File
@@ -1025,7 +1025,8 @@ describe('database', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_BOX,
dependsOn: [ 'dep1' ],
restoreConfig: null
restoreConfig: null,
format: 'tgz'
};
backupdb.add(backup, function (error) {
@@ -1090,7 +1091,8 @@ describe('database', function () {
version: '1.0.0',
type: backupdb.BACKUP_TYPE_APP,
dependsOn: [ ],
restoreConfig: { manifest: { foo: 'bar' } }
restoreConfig: { manifest: { foo: 'bar' } },
format: 'tgz'
};
backupdb.add(backup, function (error) {
+2 -2
View File
@@ -115,8 +115,8 @@ describe('Storage', function () {
gSourceFolder = path.join(__dirname, 'storage');
gDestinationFolder = path.join(gTmpFolder, 'destination/');
gBackupId_1 = backups._getBackupFilePath(gBackupConfig, 'someprefix/one');
gBackupId_2 = backups._getBackupFilePath(gBackupConfig, 'someprefix/two');
gBackupId_1 = backups._getBackupFilePath(gBackupConfig, 'someprefix/one', gBackupConfig.format);
gBackupId_2 = backups._getBackupFilePath(gBackupConfig, 'someprefix/two', gBackupConfig.format);
done();
});