From 4296eed429289b463177e11ead28af9c294474bd Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Wed, 22 Mar 2017 19:55:03 -0400
Subject: [PATCH] Fix test_history cleanup failure.

The test may be skipped if the PyQt5.QtWebKitWidget import fails, but the
cleanup was still running and trying to delete a nonexistant web-history.
---
 tests/unit/browser/webkit/test_history.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/browser/webkit/test_history.py b/tests/unit/browser/webkit/test_history.py
index 9d8711152..84af5fb46 100644
--- a/tests/unit/browser/webkit/test_history.py
+++ b/tests/unit/browser/webkit/test_history.py
@@ -325,12 +325,12 @@ def test_history_interface(qtbot, webview, hist_interface):
 
 @pytest.fixture
 def cleanup_init():
-    yield
     # prevent test_init from leaking state
-    hist = objreg.get('web-history')
-    hist.setParent(None)
-    objreg.delete('web-history')
+    yield
     try:
+        hist = objreg.get('web-history')
+        hist.setParent(None)
+        objreg.delete('web-history')
         from PyQt5.QtWebKit import QWebHistoryInterface
         QWebHistoryInterface.setDefaultInterface(None)
     except: