diff --git a/nodejs-winston-0.7.3-Shutdown-server.patch b/nodejs-winston-0.7.3-Shutdown-server.patch new file mode 100644 index 0000000..12aa8dd --- /dev/null +++ b/nodejs-winston-0.7.3-Shutdown-server.patch @@ -0,0 +1,37 @@ +commit ffe5582cf09a83d255b51298470d67b222e1cd2b +Author: Tom Hughes +Date: Sat Nov 21 15:58:24 2015 +0000 + + Shutdown web server after test to avoid hang + +diff --git a/test/container-test.js b/test/container-test.js +index 2fcc26a..22f2a62 100644 +--- a/test/container-test.js ++++ b/test/container-test.js +@@ -72,11 +72,11 @@ vows.describe('winston/container').addBatch({ + }, + "the get() method": { + topic: function (container) { +- var server = http.createServer(function (req, res) { ++ this.server = http.createServer(function (req, res) { + res.end(); + }); + +- server.listen(this.port, this.callback.bind(this, null)); ++ this.server.listen(this.port, this.callback.bind(this, null)); + }, + "should add the logger correctly": function () { + this.someLogger = this.container.get('some-logger'); +@@ -92,8 +92,10 @@ vows.describe('winston/container').addBatch({ + assert.instanceOf(this.someOtherLogger.transports['webhook'], winston.transports.Webhook); + assert.strictEqual(this.someOtherLogger.transports['webhook'], this.transports[0]); + assert.strictEqual(this.someOtherLogger.transports['webhook'], this.someLogger.transports['webhook']); ++ ++ this.server.close(); + } + } + } + } +-}).export(module); +\ No newline at end of file ++}).export(module); diff --git a/nodejs-winston.spec b/nodejs-winston.spec index 9290b7d..74b9655 100644 --- a/nodejs-winston.spec +++ b/nodejs-winston.spec @@ -4,7 +4,7 @@ Name: nodejs-winston Version: 0.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A multiple transport asynchronous logging library for Node.js License: MIT Group: System Environment/Libraries @@ -12,6 +12,7 @@ URL: https://github.com/flatiron/winston Source0: http://registry.npmjs.org/winston/-/winston-%{version}.tgz Patch0: %{name}-0.7.2-Remove-stream-tests.patch +Patch1: %{name}-0.7.3-Shutdown-server.patch BuildArch: noarch %if 0%{?fedora} >= 19 @@ -53,6 +54,9 @@ parts of the process to make it more flexible and extensible. %setup -q -n package find . -type f -iname '*.js' -exec chmod -x '{}' \; %patch0 -p1 +%patch1 -p1 +%nodejs_fixdep async '^1.5.0' +%nodejs_fixdep colors '^1.1.2' %nodejs_fixdep request '~2.14' @@ -82,6 +86,10 @@ rm -f test/transports/webhook-test.js %changelog +* Sat Nov 21 2015 Tom Hughes - 0.7.3-4 +- Update npm(async) and npm(colors) dependencies +- Patch tests to avoid hang + * Wed Jun 17 2015 Fedora Release Engineering - 0.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild