From patchwork Fri May 3 16:42:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13884 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 C8DA416F93; Fri, 3 May 2019 17:48:57 +0100 (BST) 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,T_DKIM_INVALID, URIBL_BLOCKED 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 487F016F91 for ; Fri, 3 May 2019 17:48:57 +0100 (BST) Received: from localhost ([127.0.0.1]:44537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMm-0007s8-U2 for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:48:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ6-0005X3-Pi for guix-patches@gnu.org; Fri, 03 May 2019 12:45:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ4-0004yR-T6 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ4-0004xz-L6 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ4-0007NI-FZ for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 15/24] gnu: calibre: Disable sqlite test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690186228172 (code B ref 35446); Fri, 03 May 2019 16:45:06 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:22 +0000 Received: from localhost ([127.0.0.1]:49539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIM-0007KF-E4 for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:22 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIH-0007Ix-Ij for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 205F8A0206 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901852; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q2QXRnpf0y+t2tVvry/jEqt1D3gyd/UXESeWbOMlmaU=; b=yv03shvuO2WGAlNrnqaJDwhIMfb0bGE6OYSVO8CZJ2gQijAN9kaAldoB3SmWNZ69lPQ2uo CO1TASJq8hVURlOUpDkHnGF09aDdsCwaHgbKWrQOiSykWNHNYpCsiNuvNrkOpH5JisKKrr nn/+MKMocQ1XvDtuDdlzWEguqN7APc3OfO7Pbo/TSvrK7ZY5NUGDB99tHWHM4aQXTtKW0o cb1I1UaHI7xSPOsgKOAJGgMErAZ7djaEs+q0l6mC2j1+UC2Ht+5X+6GeIlyjizjfmTx6Wg 1p+u5fAIzTjFV2568K3d9TIarMMzr1V5ATbctp3BL9vv4Bx7C2Ko9Ja9rYH2Jw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id zQ24NiEzbH2A for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:55 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:23 +1000 Message-Id: <20190503164232.1799-15-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 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/local.mk: Reference patch gnu/packages/ebook.scm (calibre)[origin]: Enable patch. gnu/packages/patches/calibre-remove-test-sqlite.patch: New file. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 1 + .../patches/calibre-remove-test-sqlite.patch | 29 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 gnu/packages/patches/calibre-remove-test-sqlite.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9e31868281..d6f52ae87e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -691,6 +691,7 @@ dist_patch_DATA = \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ + %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b0d14ece68..1c0721798f 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -98,6 +98,7 @@ #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-bs4.patch" ;; TODO: fix test. + "calibre-remove-test-sqlite.patch" ;; TODO: fix test. "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs diff --git a/gnu/packages/patches/calibre-remove-test-sqlite.patch b/gnu/packages/patches/calibre-remove-test-sqlite.patch new file mode 100644 index 0000000000..7bdd90874d --- /dev/null +++ b/gnu/packages/patches/calibre-remove-test-sqlite.patch @@ -0,0 +1,29 @@ +From a92e26359bd07743ab105819ed0b619e27e14017 Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Sat, 27 Apr 2019 03:30:53 +1000 +Subject: [PATCH] Disable test_sqlite. + +--- + src/calibre/test_build.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py +index 07bdffd3e5..740588c95b 100644 +--- a/src/calibre/test_build.py ++++ b/src/calibre/test_build.py +@@ -162,12 +162,6 @@ class BuildTest(unittest.TestCase): + au(x, 'strftime') + self.assertEqual(unicode_type(time.strftime(fmt.replace('%e', '%#d'), t)), x) + +- def test_sqlite(self): +- import sqlite3 +- conn = sqlite3.connect(':memory:') +- from calibre.library.sqlite import load_c_extensions +- self.assertTrue(load_c_extensions(conn, True), 'Failed to load sqlite extension') +- + def test_apsw(self): + import apsw + conn = apsw.Connection(':memory:') +-- +2.21.0 +