[test] improve query tests. fix rows option for File transport.

apiaryio · May 15, 2012 · 0ccbc4c · 0ccbc4c
1 parent 3bec167
commit 0ccbc4c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/lib/winston/transports/file.js b/lib/winston/transports/file.js
@@ -213,7 +213,12 @@ File.prototype.query = function (options, callback) {
 
   function push(log) {
     if (options.rows && results.length >= options.rows) {
-      return stream.destroy();
+      try {
+        stream.destroy();
+      } catch (e) {
+        ;
+      }
+      return;
     }
 
     if (options.fields) {
@@ -233,7 +238,8 @@ File.prototype.query = function (options, callback) {
     if (typeof log !== 'object') return;
 
     var time = new Date(log.timestamp);
-    if (time < options.from || time > options.until) {
+    if ((options.from && time < options.from)
+        || (options.until && time > options.until)) {
       return;
     }
 

diff --git a/test/transports/transport.js b/test/transports/transport.js
@@ -11,6 +11,13 @@ module.exports = function (transport, options) {
         ]
       });
 
+  // hack to fix transports that don't log
+  // any unit of time smaller than seconds
+  var common = require('../../lib/winston/common');
+  common.timestamp = function() {
+    return new Date().toISOString();
+  };
+
   var transport = logger.transports[logger._names[0]];
 
   var out = {
@@ -46,7 +53,7 @@ module.exports = function (transport, options) {
           if (!transport.query) return;
           var cb = this.callback;
           logger.log('info', 'hello world', {}, function () {
-            logger.query({}, cb);
+            logger.query(cb);
           });
         },
         'should return matching results': function (err, results) {
@@ -74,26 +81,32 @@ module.exports = function (transport, options) {
           while (!Array.isArray(results)) {
             results = results[Object.keys(results).pop()];
           }
-          //assert.equal(results.length, 1);
+          assert.equal(results.length, 1);
         }
       },
       'using fields and order option': {
         'topic': function (logger) {
           if (!transport.query) return;
           var cb = this.callback;
-          logger.log('info', 'hello world', {}, function () {
-            logger.query({ order: 'asc', fields: ['timestamp'] }, cb);
-          });
+          // wait a second to increase timestamp
+          // some transports may not be logging
+          // a timestamp in smaller units of time
+          // than seconds.
+          setTimeout(function () {
+            logger.log('info', 'hello world', {}, function () {
+              logger.query({ order: 'asc', fields: ['timestamp'] }, cb);
+            });
+          }, 2000);
         },
         'should return matching results': function (err, results) {
           if (!transport.query) return;
           results = results[transport.name];
           while (!Array.isArray(results)) {
             results = results[Object.keys(results).pop()];
           }
-          //assert.equal(Object.keys(results[0]).length, 1);
-          //assert.ok(new Date(results.shift().timestamp)
-          //        < new Date(results.pop().timestamp));
+          assert.equal(Object.keys(results[0]).length, 1);
+          assert.ok(new Date(results.shift().timestamp)
+                  < new Date(results.pop().timestamp));
         }
       }
     },