remove mkdirp use
node 10.12 has { recursive: true }
This commit is contained in:
@@ -16,7 +16,6 @@ var async = require('async'),
|
||||
expect = require('expect.js'),
|
||||
fs = require('fs'),
|
||||
os = require('os'),
|
||||
mkdirp = require('mkdirp'),
|
||||
moment = require('moment'),
|
||||
path = require('path'),
|
||||
rimraf = require('rimraf'),
|
||||
@@ -139,7 +138,7 @@ describe('backups', function () {
|
||||
const BACKUP_DIR = path.join(os.tmpdir(), 'cloudron-backup-test');
|
||||
|
||||
async.series([
|
||||
mkdirp.bind(null, BACKUP_DIR),
|
||||
fs.mkdir.bind(null, BACKUP_DIR, { recursive: true }),
|
||||
database.initialize,
|
||||
database._clear,
|
||||
settings.setBackupConfig.bind(null, {
|
||||
@@ -371,7 +370,7 @@ describe('backups', function () {
|
||||
});
|
||||
|
||||
it('succeeds to set backup config', function (done) {
|
||||
mkdirp.sync(backupConfig.backupFolder);
|
||||
fs.mkdirSync(backupConfig.backupFolder, { recursive: true });
|
||||
|
||||
settings.setBackupConfig(backupConfig, function (error) {
|
||||
expect(error).to.be(null);
|
||||
|
||||
+1
-2
@@ -1,7 +1,6 @@
|
||||
'use strict';
|
||||
|
||||
var fs = require('fs'),
|
||||
mkdirp = require('mkdirp'),
|
||||
path = require('path'),
|
||||
rimraf = require('rimraf');
|
||||
|
||||
@@ -11,7 +10,7 @@ exports = module.exports = {
|
||||
|
||||
function createTree(root, obj) {
|
||||
rimraf.sync(root);
|
||||
mkdirp.sync(root);
|
||||
fs.mkdirSync(root, { recursive: true });
|
||||
|
||||
function createSubTree(tree, curpath) {
|
||||
for (var key in tree) {
|
||||
|
||||
@@ -15,7 +15,6 @@ var BoxError = require('../boxerror.js'),
|
||||
os = require('os'),
|
||||
path = require('path'),
|
||||
rimraf = require('rimraf'),
|
||||
mkdirp = require('mkdirp'),
|
||||
recursive_readdir = require('recursive-readdir'),
|
||||
s3 = require('../storage/s3.js'),
|
||||
gcs = require('../storage/gcs.js'),
|
||||
@@ -308,19 +307,19 @@ describe('Storage', function () {
|
||||
var GCSMockBasePath = path.join(os.tmpdir(), 'gcs-backup-test-buckets/');
|
||||
|
||||
before(function () {
|
||||
var mockGCS = function(cfg){
|
||||
return {bucket: function(b){
|
||||
var mockGCS = function(){
|
||||
return {bucket: function(){
|
||||
var file = function(filename){
|
||||
|
||||
var ensurePathWritable = function (filename) {
|
||||
filename = GCSMockBasePath + filename;
|
||||
mkdirp.sync(path.dirname(filename));
|
||||
fs.mkdirSync(path.dirname(filename), { recursive: true });
|
||||
return filename;
|
||||
};
|
||||
|
||||
return {
|
||||
name: filename,
|
||||
createReadStream: function(cfg){
|
||||
createReadStream: function(){
|
||||
return fs.createReadStream(ensurePathWritable(filename))
|
||||
.on('error', function(e){
|
||||
console.log('error createReadStream: '+filename);
|
||||
@@ -329,7 +328,7 @@ describe('Storage', function () {
|
||||
})
|
||||
;
|
||||
},
|
||||
createWriteStream: function(cfg){
|
||||
createWriteStream: function(){
|
||||
return fs.createWriteStream(ensurePathWritable(filename));
|
||||
},
|
||||
delete: function(cb){
|
||||
|
||||
Reference in New Issue
Block a user