* 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 c1e75879200be03c26f9eb3c71d3082942faa0f9..13e937413af6f8798876db575b29467ee8b364d1 100644 (file)
--- 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 b764511e5dc524a3fa91182d18c0608dcc25f189..4f597f236fff7f174e5ac466ac01c8e47cd7496d 100644 (file)
--- 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: