From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39754)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fcSJ4-0001Ew-Ow
	for guix-patches@gnu.org; Mon, 09 Jul 2018 05:18:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fcSJ0-0001Hu-JD
	for guix-patches@gnu.org; Mon, 09 Jul 2018 05:18:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:43810)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fcSJ0-0001Hp-Ez
	for guix-patches@gnu.org; Mon, 09 Jul 2018 05:18:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fcSJ0-0004Zn-4p
	for guix-patches@gnu.org; Mon, 09 Jul 2018 05:18:02 -0400
Subject: [bug#31911] services: Add prometheus-node-exporter-service-type.
Resent-Message-ID: <handler.31911.D31911.153112783217530@debbugs.gnu.org>
References: <20180620125946.7264-1-boskovits@gmail.com>
	<CAE4v=pjd+26rcbsE5=_tv9yD=01VBbz46atabwmvOzi8+7LauA@mail.gmail.com>
From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur <clement@lassieur.org>
In-reply-to: <CAE4v=pjd+26rcbsE5=_tv9yD=01VBbz46atabwmvOzi8+7LauA@mail.gmail.com>
Date: Mon, 09 Jul 2018 11:17:09 +0200
Message-ID: <87sh4s93ai.fsf@lassieur.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: =?UTF-8?Q?G=C3=A1bor?= Boskovits <boskovits@gmail.com>
Cc: 31911-done@debbugs.gnu.org

Hi G=C3=A1bor,

G=C3=A1bor Boskovits <boskovits@gmail.com> writes:

> Pushed to master as a33652ee336ae9a5d2ab5fd54bf2397caec42a0e.

> +          (test-assert "prometheus-node-exporter running"
> +            (marionette-eval
> +             '(begin
> +                (use-modules (gnu services herd))
> +                (match (start-service 'prometheus-node-exporter)
> +                  (#f #f)
> +                  (('service response-parts ...)
> +                   (match (assq-ref response-parts 'running)
> +                     ((pid) (number? pid))))))
> +             marionette))

The PID check is useless because START-SERVICE will return #f if the
service fails to start.  Instead, I'd use:

          (test-assert "prometheus-node-exporter running"
            (marionette-eval
             '(begin
                (use-modules (gnu services herd))
                (start-service 'prometheus-node-exporter))
             marionette))

This would also make the test more robust to service changes (e.g. it
would still work if MAKE-FORKEXEC-CONSTRUCTOR is removed).

Cl=C3=A9ment