From 9bf9f699b130e35e4ca57301db1f614682b4f762 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 24 Sep 2020 11:47:11 -0700 Subject: [PATCH] Add skip condition for some dbus tests * test/lisp/net/dbus-tests.el (dbus-test01-type-conversion) (dbus-test01-basic-types): Add skip for hydra.nixos.org failures. ; Standardize license notice --- test/lisp/net/dbus-tests.el | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el index 2f20fcc1e67..0f5582bfc9d 100644 --- a/test/lisp/net/dbus-tests.el +++ b/test/lisp/net/dbus-tests.el @@ -4,18 +4,20 @@ ;; Author: Michael Albinus -;; This program is free software: you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation, either version 3 of the -;; License, or (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, but -;; WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. -;; +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see `https://www.gnu.org/licenses/'. +;; along with GNU Emacs. If not, see . ;;; Code: @@ -63,6 +65,7 @@ (ert-deftest dbus-test01-type-conversion () "Check type conversion functions." + (skip-unless dbus--test-enabled-session-bus) (let ((ustr "0123abc_xyz\x01\xff") (mstr "Grüß Göttin")) (should @@ -93,6 +96,7 @@ (ert-deftest dbus-test01-basic-types () "Check basic D-Bus type arguments." + (skip-unless dbus--test-enabled-session-bus) ;; Unknown keyword. (should-error (dbus-check-arguments :session dbus--test-service :keyword) -- 2.39.5