From d3dc90cb2a23bd3feec1a2e786e7274fd2b8ce70 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 18 Dec 2015 20:24:03 +0100 Subject: [PATCH] Revert "tests: Use urllib to load redirect-later-continue." This reverts commit 1e43b882ae2ae7b33f80a219b41ded16ffb8881a. Seems like this causes other trouble (the redirect-later request missing?!) --- tests/integration/features/conftest.py | 8 -------- tests/integration/features/misc.feature | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/integration/features/conftest.py b/tests/integration/features/conftest.py index c94f99f38..af07b0f20 100644 --- a/tests/integration/features/conftest.py +++ b/tests/integration/features/conftest.py @@ -25,7 +25,6 @@ import json import os.path import logging import collections -import urllib.request import pytest import yaml @@ -192,13 +191,6 @@ def fill_clipboard(qtbot, qapp, httpbin, what, content): clipboard.setText(content, mode) -@bdd.when("I continue the redirect") -def continue_redirect(httpbin): - url = 'http://localhost:{}/custom/redirect-later-continue'.format( - httpbin.port) - urllib.request.urlopen(url) - - ## Then diff --git a/tests/integration/features/misc.feature b/tests/integration/features/misc.feature index eba25b5cb..ea033405d 100644 --- a/tests/integration/features/misc.feature +++ b/tests/integration/features/misc.feature @@ -127,7 +127,7 @@ Feature: Various utility commands. And I wait for "emitting: cur_load_status_changed('loading') (tab *)" in the log And I wait 1s And I run :stop - And I continue the redirect + And I open custom/redirect-later-continue in a new tab And I wait 1s Then the unordered requests should be: custom/redirect-later-continue