From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 15 Nov 2013 13:49:17 +0000 (+0100)
Subject: * automated/tramp-tests.el (tramp-test29-utf8): Cleanup the
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~815
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82407168e69efbf9c9f6745ef3356cf6f6314cb3;p=emacs.git

* automated/tramp-tests.el (tramp-test29-utf8): Cleanup the
connection before running the test.  Reenable last test case.
---

diff --git a/test/ChangeLog b/test/ChangeLog
index c1e75879200..13e937413af 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	* automated/tramp-tests.el (tramp-test29-utf8): Cleanup the
+	connection before running the test.
+
 2013-11-15  Michael Albinus  <michael.albinus@gmx.de>
 
 	* automated/tramp-tests.el (tramp-test15-copy-directory)
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index b764511e5dc..4f597f236ff 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -1067,8 +1067,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 (ert-deftest tramp-test29-utf8 ()
   "Check UTF8 encoding in file names and file contents."
   (skip-unless (tramp--test-enabled))
+  ;; TODO: It shall be possible to call it in every test.
+  (tramp-cleanup-connection
+   (tramp-dissect-file-name tramp-test-temporary-file-directory)
+   nil 'keep-password)
   (let ((tmp-name (tramp--test-make-temp-name))
-	(arabic "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت.")
+	(arabic "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت")
 	(chinese "银河系漫游指南系列")
 	(russian "Автостопом по гала́ктике"))
     (unwind-protect
@@ -1083,9 +1087,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 		(insert-file-contents file)
 		(should (string-equal (buffer-string) lang)))))
 	  ;; Check file name.
-;	  (should (equal (directory-files
-;			  tmp-name nil directory-files-no-dot-files-regexp)
-);			 (sort `(,arabic ,chinese ,russian) 'string-lessp))))
+	  (should (equal (directory-files
+			  tmp-name nil directory-files-no-dot-files-regexp)
+			 (sort `(,arabic ,chinese ,russian) 'string-lessp))))
       (ignore-errors (delete-directory tmp-name 'recursive)))))
 
 ;; TODO: