#178 Remove jobList and workerList after tests.

Put these in test-tmp during TESTING.
webgme · Feb 26, 2015 · c601bc2 · c601bc2
1 parent b0887d6
commit c601bc2
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 4 deletions.
diff --git a/src/middleware/executor/Executor.js b/src/middleware/executor/Executor.js
@@ -20,10 +20,11 @@ define(['logManager',
     ],
     function (logManager, fs, path, child_process, bufferEqual, DataStore, JobInfo, WorkerInfo) {
         'use strict';
-
+        var jobListDBFile = TESTING ? 'test-tmp/jobList.nedb' : 'jobList.nedb';
+        var workerListDBFile = TESTING ? 'test-tmp/workerList.nedb' : 'workerList.nedb';
         var logger = logManager.create('REST-Executor'); //how to define your own logger which will use the global settings
 
-        var jobList = new DataStore({filename: 'jobList.nedb', autoload: true});
+        var jobList = new DataStore({filename: jobListDBFile, autoload: true});
         jobList.ensureIndex({fieldName: 'hash', unique: true}, function (err) {
             if (err) {
                 console.error(err);
@@ -33,7 +34,7 @@ define(['logManager',
 
         var workerRefreshInterval = 5 * 1000;
         // worker = { clientId:, lastSeen: }
-        var workerList = new DataStore({filename: 'workerList.nedb', autoload: true});
+        var workerList = new DataStore({filename: workerListDBFile, autoload: true});
         var workerTimeout = function () {
             if (process.uptime() < workerRefreshInterval / 1000 * 5) {
                 return;

diff --git a/test/middleware/executor/Executor.spec.js b/test/middleware/executor/Executor.spec.js
@@ -8,6 +8,7 @@ require('../../_globals.js');
 
 var agent = require('superagent').agent(),
     should = require('chai').should(),
+    fs = require('fs'),
     server,
     serverBaseUrl;
 
@@ -16,6 +17,16 @@ describe('Executor', function () {
 
     afterEach(function (done) {
         server.stop(done);
+        try {
+            fs.unlinkSync('test-tmp/jobList.nedb');
+        } catch (err) {
+            //console.log(err);
+        }
+        try {
+            fs.unlinkSync('test-tmp/workerList.nedb');
+        } catch (err) {
+            //console.log(err);
+        }
     });
 
     it('should return 200 at rest/executor/worker/ with enableExecutor=true', function (done) {

diff --git a/test/middleware/executor/ExecutorClient.spec.js b/test/middleware/executor/ExecutorClient.spec.js
@@ -7,12 +7,13 @@
 require('../../_globals.js');
 
 var requirejs = require('requirejs'),
+    fs = require('fs'),
     should = require('chai').should(),
     ExecutorClient = requirejs('executor/ExecutorClient'),
     executorClient,
     server,
     serverBaseUrl;
-// TODO: How to specify the nedb paths for jobList and workerList?
+
 describe('ExecutorClient', function () {
     'use strict';
 
@@ -37,6 +38,16 @@ describe('ExecutorClient', function () {
 
     after(function (done) {
         server.stop(done);
+        try {
+            fs.unlinkSync('test-tmp/jobList.nedb');
+        } catch (err) {
+            //console.log(err);
+        }
+        try {
+            fs.unlinkSync('test-tmp/workerList.nedb');
+        } catch (err) {
+            //console.log(err);
+        }
     });
 
     it('getWorkersInfo should return empty object', function (done) {
@@ -92,6 +103,38 @@ describe('ExecutorClient', function () {
         });
     });
 
+    it('updateJob with SUCCESS followed by getInfo should return SUCCESS in jobInfo', function (done) {
+        var jobInfo = {
+            hash: '88804f10a36aa4214f5b0095ba8099e729a10f46'
+        };
+        executorClient.createJob(jobInfo, function (err, res) {
+            var createTime;
+            if (err) {
+                done(err);
+                return;
+            }
+            should.equal(typeof res, 'object');
+            createTime = res.createTime;
+            should.equal(res.status, 'CREATED');
+            should.equal(typeof createTime, 'string');
+            jobInfo.status = 'SUCCESS';
+            executorClient.updateJob(jobInfo, function (err) {
+                if (err) {
+                    done(err);
+                }
+                executorClient.getInfo(jobInfo.hash, function (err, res) {
+                    if (err) {
+                        done(err);
+                        return;
+                    }
+                    should.equal(typeof res, 'object');
+                    should.equal(res.createTime, createTime);
+                    should.equal(res.status, 'SUCCESS');
+                    done();
+                });
+            });
+        });
+    });
     //it('getInfoByStatus SUCCESS should succeed', function (done) {
     //    executorClient.getInfoByStatus('SUCCESS', function(err, res) {
     //        should.equal(err, null);