From patchwork Mon Jan 14 16:32:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 741 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 01E4A16A73; Mon, 14 Jan 2019 16:43:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1552116A71 for ; Mon, 14 Jan 2019 16:43:32 +0000 (GMT) Received: from localhost ([127.0.0.1]:42633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj5Kl-0000yc-7w for patchwork@mira.cbaines.net; Mon, 14 Jan 2019 11:43:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj5Ae-0000gb-4l for guix-patches@gnu.org; Mon, 14 Jan 2019 11:33:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj5Ad-0000tR-4V for guix-patches@gnu.org; Mon, 14 Jan 2019 11:33:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj5Ad-0000tF-18 for guix-patches@gnu.org; Mon, 14 Jan 2019 11:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gj5Ac-00007C-SO for guix-patches@gnu.org; Mon, 14 Jan 2019 11:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34071] [PATCH v3] tests: docker: Run a guest guile inside the docker container. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jan 2019 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34071@debbugs.gnu.org Received: via spool by 34071-submit@debbugs.gnu.org id=B34071.1547483553379 (code B ref 34071); Mon, 14 Jan 2019 16:33:02 +0000 Received: (at 34071) by debbugs.gnu.org; 14 Jan 2019 16:32:33 +0000 Received: from localhost ([127.0.0.1]:59248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gj5A8-000062-LZ for submit@debbugs.gnu.org; Mon, 14 Jan 2019 11:32:32 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:42988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gj5A7-00005l-Cq for 34071@debbugs.gnu.org; Mon, 14 Jan 2019 11:32:32 -0500 Received: from dayas.3.home (77.116.158.150.wireless.dyn.drei.com [77.116.158.150]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 8686C3360514; Mon, 14 Jan 2019 17:32:29 +0100 (CET) From: Danny Milosavljevic Date: Mon, 14 Jan 2019 17:32:24 +0100 Message-Id: <20190114163225.16444-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114144643.26997-1-dannym@scratchpost.org> References: <20190114144643.26997-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/tests/docker.scm (run-docker-test): Add parameters. Load and run docker container. Check response of guest guile. (build-tarball&run-docker-test): New procedure. (%test-docker): Use it. [description]: Modify. --- gnu/tests/docker.scm | 80 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 6 deletions(-) diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 453ed4893..1b22bad12 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -26,11 +26,22 @@ #:use-module (gnu services networking) #:use-module (gnu services docker) #:use-module (gnu services desktop) + #:use-module (gnu packages bootstrap) ; %bootstrap-guile #:use-module (gnu packages docker) #:use-module (guix gexp) + #:use-module (guix grafts) + #:use-module (guix monads) + #:use-module (guix packages) + #:use-module (guix profiles) + #:use-module (guix scripts pack) #:use-module (guix store) + #:use-module (guix tests) + #:use-module (guix build-system trivial) #:export (%test-docker)) +;; Globally disable grafts because they can trigger early builds. +;(%graft? #f) + (define %docker-os (simple-operating-system (service dhcp-client-service-type) @@ -39,8 +50,9 @@ (service elogind-service-type) (service docker-service-type))) -(define (run-docker-test) - "Run tests in %DOCKER-OS." +(define (run-docker-test docker-tarball) + "Load DOCKER-TARBALL as Docker image and run it in a Docker container, +inside %DOCKER-OS." (define os (marionette-operating-system %docker-os @@ -50,8 +62,8 @@ (define vm (virtual-machine (operating-system os) - (memory-size 500) - (disk-image-size (* 250 (expt 2 20))) + (memory-size 1500) + (disk-image-size (* 1500 (expt 2 20))) (port-forwardings '()))) (define test @@ -87,13 +99,69 @@ "version")) marionette)) + (test-equal "Load docker image and run it" + "hello world" + (marionette-eval + `(begin + (define slurp + (lambda args + (let* ((port (apply open-pipe* OPEN_READ args)) + (output (read-line port)) + (status (close-pipe port))) + output))) + (let* ((raw-line (slurp ,(string-append #$docker-cli + "/bin/docker") + "load" "-i" + ,#$docker-tarball)) + (repository&tag (string-drop raw-line + (string-length + "Loaded image: "))) + (response (slurp + ,(string-append #$docker-cli "/bin/docker") + "run" "--entrypoint" "bin/Guile" + repository&tag + "/aa.scm"))) + response)) + marionette)) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) (gexp->derivation "docker-test" test)) +(define (build-tarball&run-docker-test) + (mlet* %store-monad + ((_ (set-grafting #f)) + (guile (set-guile-for-build (default-guile))) + (guest-script-package -> + (dummy-package "guest-script" + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:builder + (let ((out (assoc-ref %outputs "out"))) + (mkdir out) + (call-with-output-file (string-append out "/a.scm") + (lambda (port) + (display "(display \"hello world\n\")" port))) + #t))))) + (profile (profile-derivation (packages->manifest + (list %bootstrap-guile + guest-script-package)) + #:hooks '() + #:locales? #f)) + (tarball (docker-image "docker-pack" profile + #:symlinks '(("/bin/Guile" -> "bin/guile") + ("aa.scm" -> "a.scm")) + #:localstatedir? #t))) + (run-docker-test tarball))) + (define %test-docker (system-test (name "docker") - (description "Connect to the running Docker service.") - (value (run-docker-test)))) + (description "Test Docker container of Guix.") + (value (build-tarball&run-docker-test)))) + +;; Local Variables: +;; eval: (put 'test-assertm 'scheme-indent-function 2) +;; End: