[Pkg-javascript-commits] [node-stream-http] 207/208: merge patched into master
Bastien Roucariès
rouca at moszumanska.debian.org
Sun Aug 13 13:39:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-stream-http.
commit ffe4b829ff11d49f7e407d7f7f235739302b65cb
Merge: 3cf52e0 fba6267
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Mon Jun 12 22:47:11 2017 +0200
merge patched into master
debian/.git-dpm | 4 +-
.../0002-Use-not-well-known-port-for-test.patch | 129 +++++++++++++++++++++
debian/patches/series | 1 +
test/node/http-browserify.js | 32 ++---
4 files changed, 150 insertions(+), 16 deletions(-)
diff --cc debian/.git-dpm
index b429c38,0000000..56db089
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- e8363ed709b60cc55a4637e3ca5f940e243ac982
- e8363ed709b60cc55a4637e3ca5f940e243ac982
++fba62678094979bad0a8fe2dfdfb0a0261b98061
++fba62678094979bad0a8fe2dfdfb0a0261b98061
+add99fba705feeea9609ceff5faae6525fd651aa
+add99fba705feeea9609ceff5faae6525fd651aa
+node-stream-http_2.7.1+dfsg.orig.tar.gz
+9753c60707174a42c029613316857fdad8b86ccc
+17308
diff --cc debian/patches/0002-Use-not-well-known-port-for-test.patch
index 0000000,0000000..ba38b72
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-not-well-known-port-for-test.patch
@@@ -1,0 -1,0 +1,129 @@@
++From fba62678094979bad0a8fe2dfdfb0a0261b98061 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Mon, 12 Jun 2017 22:46:45 +0200
++Subject: Use not well known port for test
++
++Avoid problem on buildd
++
++Forwarded: no
++---
++ test/node/http-browserify.js | 32 ++++++++++++++++++--------------
++ 1 file changed, 18 insertions(+), 14 deletions(-)
++
++diff --git a/test/node/http-browserify.js b/test/node/http-browserify.js
++index fda8512..dc4244a 100644
++--- a/test/node/http-browserify.js
+++++ b/test/node/http-browserify.js
++@@ -3,7 +3,10 @@
++ var test = require('tape')
++ var url = require('url')
++
++-var location = 'http://localhost:8081/foo/123'
+++var port1 = 30801;
+++var port2 = 30882;
+++
+++var location = 'http://localhost:'+port1+'/foo/123'
++
++ var noop = function() {}
++ global.location = url.parse(location)
++@@ -22,20 +25,21 @@ test('Test simple url string', function(t) {
++ var request = http.get(testUrl, noop)
++
++ var resolved = url.resolve(location, request._opts.url)
++- t.equal(resolved, 'http://localhost:8081/api/foo', 'Url should be correct')
+++ var url1 = 'http://localhost:'+port1.toString()+'/api/foo';
+++ t.equal(resolved, url1, 'Url1 should be correct')
++ t.end()
++
++ })
++
++ test('Test full url object', function(t) {
++ var testUrl = {
++- host: "localhost:8081",
+++ host: "localhost:"+port1,
++ hostname: "localhost",
++- href: "http://localhost:8081/api/foo?bar=baz",
+++ href: "http://localhost:"+port1.toString()+"/api/foo?bar=baz",
++ method: "GET",
++ path: "/api/foo?bar=baz",
++ pathname: "/api/foo",
++- port: "8081",
+++ port: port1.toString(),
++ protocol: "http:",
++ query: "bar=baz",
++ search: "?bar=baz",
++@@ -45,7 +49,7 @@ test('Test full url object', function(t) {
++ var request = http.get(testUrl, noop)
++
++ var resolved = url.resolve(location, request._opts.url)
++- t.equal(resolved, 'http://localhost:8081/api/foo?bar=baz', 'Url should be correct')
+++ t.equal(resolved, 'http://localhost:'+port1.toString()+'/api/foo?bar=baz', 'Url should be correct')
++ t.end()
++ })
++
++@@ -53,21 +57,21 @@ test('Test alt protocol', function(t) {
++ var params = {
++ protocol: "foo:",
++ hostname: "localhost",
++- port: "3000",
+++ port: port2.toString(),
++ path: "/bar"
++ }
++
++ var request = http.get(params, noop)
++
++ var resolved = url.resolve(location, request._opts.url)
++- t.equal(resolved, 'foo://localhost:3000/bar', 'Url should be correct')
+++ t.equal(resolved, 'foo://localhost:'+port2.toString()+'/bar', 'Url should be correct')
++ t.end()
++ })
++
++ test('Test page with \'file:\' protocol', function (t) {
++ var params = {
++ hostname: 'localhost',
++- port: 3000,
+++ port: port2,
++ path: '/bar'
++ }
++
++@@ -79,7 +83,7 @@ test('Test page with \'file:\' protocol', function (t) {
++ global.location = normalLocation // Reset the location
++
++ var resolved = url.resolve(fileLocation, request._opts.url)
++- t.equal(resolved, 'http://localhost:3000/bar', 'Url should be correct')
+++ t.equal(resolved, 'http://localhost:'+port2+'/bar', 'Url should be correct')
++ t.end()
++ })
++
++@@ -88,7 +92,7 @@ test('Test string as parameters', function(t) {
++ var request = http.get(testUrl, noop)
++
++ var resolved = url.resolve(location, request._opts.url)
++- t.equal(resolved, 'http://localhost:8081/api/foo', 'Url should be correct')
+++ t.equal(resolved, 'http://localhost:'+port1+'/api/foo', 'Url should be correct')
++ t.end()
++ })
++
++@@ -108,11 +112,11 @@ test('Test withCredentials param', function(t) {
++ })
++
++ test('Test ipv6 address', function(t) {
++- var testUrl = 'http://[::1]:80/foo'
+++ var testUrl = 'http://[::1]:'+port1+'/foo'
++ var request = http.get(testUrl, noop)
++
++ var resolved = url.resolve(location, request._opts.url)
++- t.equal(resolved, 'http://[::1]:80/foo', 'Url should be correct')
+++ t.equal(resolved, 'http://[::1]:'+port1+'/foo', 'Url should be correct')
++ t.end()
++ })
++
++@@ -121,7 +125,7 @@ test('Test relative path in url', function(t) {
++ var request = http.get(params, noop)
++
++ var resolved = url.resolve(location, request._opts.url)
++- t.equal(resolved, 'http://localhost:8081/foo/bar', 'Url should be correct')
+++ t.equal(resolved, 'http://localhost:'+port1+'/foo/bar', 'Url should be correct')
++ t.end()
++ })
++
diff --cc debian/patches/series
index 20647bf,0000000..6b4024d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+0001-Use-extend-instead-of-xtend.patch
++0002-Use-not-well-known-port-for-test.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-stream-http.git
More information about the Pkg-javascript-commits
mailing list