Merge from emacs-24; up to 2014-06-12T14:55:[email protected]

3 files changed, 58 insertions, 5 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index c9bfc54bd8..617ac98f5d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2014-06-28  Leo Liu  <[email protected]>
+
+	* automated/calc-tests.el: New file and add tests for math-bignum.
+	(Bug#17556)
+
+2014-06-28  Michael Albinus  <[email protected]>
+
+	* automated/dbus-tests.el (dbus--test-register-service)
+	(dbus-test02-register-service-session): Replace `dbus-ping' calls
+	by `dbus-list-known-names'.  (Bug#17858)
+
 2014-06-28  Glenn Morris  <[email protected]>
 
 	* automated/Makefile.in (GDB): New variable.
diff --git a/test/automated/calc-tests.el b/test/automated/calc-tests.el
new file mode 100644
index 0000000000..b96a9e83e7
--- /dev/null
+++ b/test/automated/calc-tests.el
@@ -0,0 +1,42 @@
+;;; calc-tests.el --- tests for calc                 -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+
+;; Author: Leo Liu <[email protected]>
+;; Keywords: maint
+
+;; 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'ert)
+(require 'calc)
+
+(ert-deftest test-math-bignum ()
+  ;; bug#17556
+  (let ((n (math-bignum most-negative-fixnum)))
+    (should (math-negp n))
+    (should (cl-notany #'cl-minusp (cdr n)))))
+
+(provide 'calc-tests)
+;;; calc-tests.el ends here
+
+;; Local Variables:
+;; bug-reference-url-format: "http://debbugs.gnu.org/%s"
+;; End:
diff --git a/test/automated/dbus-tests.el b/test/automated/dbus-tests.el
index c9d9c72ec1..1af5c77de5 100644
--- a/test/automated/dbus-tests.el
+++ b/test/automated/dbus-tests.el
@@ -88,15 +88,15 @@
 
   ;; Register an own service.
   (should (eq (dbus-register-service bus dbus-service-emacs) :primary-owner))
-  (should (dbus-ping bus dbus-service-emacs 100))
+  (should (member dbus-service-emacs (dbus-list-known-names bus)))
   (should (eq (dbus-register-service bus dbus-service-emacs) :already-owner))
-  (should (dbus-ping bus dbus-service-emacs 100))
+  (should (member dbus-service-emacs (dbus-list-known-names bus)))
 
   ;; Unregister the service.
   (should (eq (dbus-unregister-service bus dbus-service-emacs) :released))
-  (should-not (dbus-ping bus dbus-service-emacs 100))
+  (should-not (member dbus-service-emacs (dbus-list-known-names bus)))
   (should (eq (dbus-unregister-service bus dbus-service-emacs) :non-existent))
-  (should-not (dbus-ping bus dbus-service-emacs 100))
+  (should-not (member dbus-service-emacs (dbus-list-known-names bus)))
 
   ;; `dbus-service-dbus' is reserved for the BUS itself.
   (should-error (dbus-register-service bus dbus-service-dbus))
@@ -109,7 +109,7 @@
   (dbus--test-register-service :session)
 
   (let ((service "org.freedesktop.Notifications"))
-    (when (dbus-ping :session service 100)
+    (when (member service (dbus-list-known-names :session))
       ;; Cleanup.
       (dbus-ignore-errors (dbus-unregister-service :session service))