pytest: Add two more dependencies

pytest was an indirect dependency so far, making that one
explicit, and the timeout plugin should allow us to kill a stuck test
before travis kills it, and thus allow us to see where it got stuck.

Signed-off-by: Christian Decker <@cdecker>

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - JSON API: `getinfo` now returns `num_peers` `num_pending_channels`,
   `num_active_channels` and `num_inactive_channels` fields.
 - JSON API: use `\n\n` to terminate responses, for simplified parsing (pylightning now relies on this)
+- Plugins: Added plugins to `lightningd` and implemented the option passthrough.
 
 ### Changed
 

contrib/Dockerfile.builder

@@ -51,4 +51,19 @@ RUN cd /tmp/ && \
     rm -rf bitcoin.tar.gz /tmp/bitcoin-$BITCOIN_VERSION
 
 RUN pip3 install --upgrade pip && \
-    python3 -m pip install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 ephemeral-port-reserve==1.1.0 pytest-xdist==1.22.2 flaky==3.4.0 CherryPy==17.3.0 Flask==1.0.2
+    python3 -m pip install \
+	CherryPy==17.3.0 \
+	Flask==1.0.2 \
+	cheroot==6.5.2 \
+	ephemeral-port-reserve==1.1.0 \
+	flaky==3.4.0 \
+	pytest-benchmark==3.1.1 \
+        pytest-forked==0.2 \
+	pytest-timeout==1.3.3 \
+	pytest-xdist==1.22.2 \
+	pytest==3.8.1 \
+	python-bitcoinlib==0.7.0 \
+	tqdm==4.26.0 \
+	pytest-test-groups==1.0.3 \
+	flake8==3.5.0 \
+	pytest-rerunfailures==3.1

contrib/Dockerfile.builder.i386

@@ -51,4 +51,19 @@ RUN cd /tmp/ && \
     rm -rf bitcoin.tar.gz /tmp/bitcoin-$BITCOIN_VERSION
 
 RUN pip3 install --upgrade pip && \
-    python3 -m pip install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 ephemeral-port-reserve==1.1.0 pytest-xdist==1.22.2 flaky==3.4.0 CherryPy==17.3.0 Flask==1.0.2
+    python3 -m pip install \
+	CherryPy==17.3.0 \
+	Flask==1.0.2 \
+	cheroot==6.5.2 \
+	ephemeral-port-reserve==1.1.0 \
+	flaky==3.4.0 \
+	pytest-benchmark==3.1.1 \
+        pytest-forked==0.2 \
+	pytest-timeout==1.3.3 \
+	pytest-xdist==1.22.2 \
+	pytest==3.8.1 \
+	python-bitcoinlib==0.7.0 \
+	tqdm==4.26.0 \
+	pytest-test-groups==1.0.3 \
+	flake8==3.5.0 \
+	pytest-rerunfailures==3.1

doc/plugins.md

@@ -68,7 +68,7 @@ this example:
 		{
 			"name": "gettime",
 			"description": "Returns the current time in {timezone}",
-			"params": ["timezone"]
+			"long_description": "Returns the current time in the timezone that is given as the only parameter.\nThis description may be quite long and is allowed to span multiple lines."
 		}
 	]
 }

tests/requirements.txt

@@ -1,3 +1,4 @@
+pytest==3.8.1
 CherryPy==17.3.0
 Flask==1.0.2
 cheroot==6.5.2
@@ -8,3 +9,4 @@ pytest-forked==0.2
 pytest-xdist==1.22.2
 python-bitcoinlib==0.7.0
 tqdm==4.26.0
+pytest-timeout==1.3.3