From adb58440e687440ecf70d2571d8bba8d215dea6a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 25 Mar 2018 23:32:44 +0200
Subject: [PATCH] gajim: Re-enable tests

Just because the tests need GTK+, I think it's not a good idea to simply
disable them when we're still able to use an X virtual framebuffer to
run them anyway.

As with the package we had prior to version 1.0 I've disabled the
resolver test, because this one requires networking.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92, @7c6f434c
---
 .../instant-messengers/gajim/default.nix        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index a60df1ead534..5a9f545bb0aa 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,6 +1,7 @@
 { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
 , python, gtk3, gobjectIntrospection
 , nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, xvfb_run, dbus
 , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
 , enableE2E ? true, pycrypto, python-gnupg
 , enableSecrets ? true, libsecret
@@ -23,6 +24,11 @@ buildPythonApplication rec {
     sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
   };
 
+  postPatch = ''
+    # This test requires network access
+    echo "" > test/integration/test_resolver.py
+  '';
+
   buildInputs = [
     gobjectIntrospection gtk3
   ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
@@ -41,12 +47,13 @@ buildPythonApplication rec {
     ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
     ++ extraPythonPackages pythonPackages;
 
-  checkPhase = ''
-    ${python.interpreter} test/runtests.py
-  '';
+  checkInputs = [ xvfb_run dbus.daemon ];
 
-  # Tests try to use GTK+ which fails.
-  doCheck = false;
+  checkPhase = ''
+    xvfb-run dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      ${python.interpreter} test/runtests.py
+  '';
 
   meta = {
     homepage = http://gajim.org/;