[Emacs-diffs] trunk r115116: * automated/tramp-tests.el (tramp-test29-utf8): Cleanup the

[Michael Albinus]

------------------------------------------------------------
revno: 115116
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-15 14:49:17 +0100
message:
  * automated/tramp-tests.el (tramp-test29-utf8): Cleanup the
  connection before running the test.  Reenable last test case.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/tramp-tests.el  tramptests.el-20131105142319-d9zp3oprkpxj5v1e-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-15 08:03:19 +0000
+++ b/test/ChangeLog    2013-11-15 13:49:17 +0000
@@ -1,5 +1,10 @@
 2013-11-15  Michael Albinus  <address@hidden>
 
+       * automated/tramp-tests.el (tramp-test29-utf8): Cleanup the
+       connection before running the test.
+
+2013-11-15  Michael Albinus  <address@hidden>
+
        * automated/tramp-tests.el (tramp-test15-copy-directory)
        (tramp-test16-directory-files, tramp-test17-insert-directory)
        (tramp-test18-file-attributes)

=== modified file 'test/automated/tramp-tests.el'
--- a/test/automated/tramp-tests.el     2013-11-15 08:28:42 +0000
+++ b/test/automated/tramp-tests.el     2013-11-15 13:49:17 +0000
@@ -1067,8 +1067,12 @@
 (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 @@
                (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: