From 80a3920aad857f9d06d8640dec4b7a3e06a7379a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 22 Aug 2016 07:23:54 +0200
Subject: [PATCH] Revert "Revert "tests: Use getfixturevalue""

This reverts commit c8fe21c85fbb94a4e198a0548ce75d9645ce9c43.
---
 tests/end2end/fixtures/quteprocess.py      | 2 +-
 tests/end2end/fixtures/test_quteprocess.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 7a6e83413..2eb384d0c 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -277,7 +277,7 @@ class QuteProc(testprocess.Process):
         if path.startswith('about:') or path.startswith('qute:'):
             return path
         else:
-            httpbin = self.request.getfuncargvalue('httpbin')
+            httpbin = self.request.getfixturevalue('httpbin')
             return '{}://localhost:{}/{}'.format(
                 'https' if https else 'http',
                 httpbin.port if port is None else port,
diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py
index 80094c588..800ac687e 100644
--- a/tests/end2end/fixtures/test_quteprocess.py
+++ b/tests/end2end/fixtures/test_quteprocess.py
@@ -70,7 +70,7 @@ class FakeRequest:
         self.config = config
         self._httpbin = httpbin
 
-    def getfuncargvalue(self, name):
+    def getfixturevalue(self, name):
         assert name == 'httpbin'
         return self._httpbin