Fix regex so that it works with Python 3.6. See . Copied from upstream bug report: https://bugs.launchpad.net/python-mox3/+bug/1665266 From 05064cdb6ea7a16450c6beae2b6f7c6074212a69 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 16 Feb 2017 00:24:10 -0800 Subject: [PATCH] RegexTest: python3.6 compatibility These fixes are backward-compatible with older python versions: * raw strings fix invalid escape sequences * flags=8 fixes ValueError: cannot use LOCALE flag with a str pattern --- mox3/tests/test_mox.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mox3/tests/test_mox.py b/mox3/tests/test_mox.py index 15ac565..3a1af17 100644 --- a/mox3/tests/test_mox.py +++ b/mox3/tests/test_mox.py @@ -312,12 +312,12 @@ class RegexTest(testtools.TestCase): def testReprWithoutFlags(self): """repr should return the regular expression pattern.""" self.assertTrue( - repr(mox.Regex(r"a\s+b")) == "") + repr(mox.Regex(r"a\s+b")) == r"") def testReprWithFlags(self): """repr should return the regular expression pattern and flags.""" - self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) == - "") + self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) == + r"") class IsTest(testtools.TestCase): -- 2.10.2 m class='right' method='get' action='/guix/log/tests/services/telephony.scm'>
AgeCommit message (Expand)Author
2021-08-02Reinstate "services: Add a service for Jami."...This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below. Thanks to Christopher Baines for reporting the failure and proposing a fix. * guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data files via the 'extra-files' argument. * gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat file to... * gnu/local.mk (MODULES_NOT_COMPILED): ... here. Maxim Cournoyer
2021-08-02Revert "services: Add a service for Jami."...This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b. It broke 'guix pull'. Maxim Cournoyer
2021-08-02services: Add a service for Jami....* gnu/services/telephony.scm (string-or-computed-file?) (string-list?, account-fingerprint-list?): New procedures. (maybe-string-list, maybe-account-fingerprint-list) (maybe-boolean, maybe-string, jami-account-list): New configuration field types. (serialize-string-list, serialize-boolean, serialize-string) (jami-account, jami-account->alist, jami-configuration) (jami-account-list?, jami-account-list-maybe): New procedures. (%jami-accounts): New variable. (jami-configuration->command-line-arguments): New procedure. (jami-dbus-session-activation, jami-shepherd-services): New procedures. (jami-service-type): New variable. * gnu/build/jami-service.scm: New file. * gnu/tests/data/jami-dummy-account.dat: Likewise. * gnu/tests/telephony.scm: Likewise. * gnu/local.mk (GNU_SYSTEM_MODULES): Register them. * Makefile.am (SCM_TESTS): Register the test file. (dist_patch_DATA): Register the new data file. * doc/guix.texi (Telephony Services): Document it. Maxim Cournoyer