From 22a2c48a263c67ab3418c22a88cec67e5c1d318c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 2 Mar 2017 05:18:37 +0300 Subject: Fix tests failure in physfs deinit. --- src/gui/widgets/browserbox_unittest.cc | 2 +- src/gui/windowmanager_unittest.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index 0dd8af585..c4810a188 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -174,9 +174,9 @@ TEST_CASE("BrowserBox tests", "browserbox") delete Widget::getGloablFont(); Widget::setGlobalFont(nullptr); delete box; - delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); + delete2(client); delete2(logger); // VirtFs::deinit(); } diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 38471370d..638b2c5b6 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -685,15 +685,15 @@ TEST_CASE("Windows tests", "windowmanager") delete2(localPlayer); delete2(userPalette); + VirtFs::removeDirFromSearchPath("data"); + VirtFs::removeDirFromSearchPath("../data"); + VirtFs::removeDirFromSearchPath("data/test"); + VirtFs::removeDirFromSearchPath("../data/test"); delete2(client); delete2(serverFeatures); delete2(inventoryHandler); delete2(charServerHandler); delete2(playerHandler); - VirtFs::removeDirFromSearchPath("data"); - VirtFs::removeDirFromSearchPath("../data"); - VirtFs::removeDirFromSearchPath("data/test"); - VirtFs::removeDirFromSearchPath("../data/test"); delete2(logger); // VirtFs::deinit(); -- cgit v1.2.3-70-g09d2