[elpa] 09/12: increasingly windows robustness of tests

[Eric Schulte]

eschulte pushed a commit to branch master
in repository elpa.

commit 25881c30cb49dd3c5792ad36da0853b1a89220ae
Author: Eric Schulte <address@hidden>
Date:   Fri May 2 16:16:31 2014 -0600

    increasingly windows robustness of tests
---
 web-server-test.el |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web-server-test.el b/web-server-test.el
index a11093c..78c6efc 100644
--- a/web-server-test.el
+++ b/web-server-test.el
@@ -31,11 +31,11 @@
    (format "curl -s -m 4 %s %s %s localhost:%s/%s"
            (or curl-flags "")
            (if get-params
-               (mapconcat (lambda (p) (format "-d '%s=%s'" (car p) (cdr p)))
+               (mapconcat (lambda (p) (format "-d \"%s=%s\"" (car p) (cdr p)))
                           get-params " ")
              "")
            (if post-params
-               (mapconcat (lambda (p) (format "-F '%s=%s'" (car p) (cdr p)))
+               (mapconcat (lambda (p) (format "-F \"%s=%s\"" (car p) (cdr p)))
                           post-params " ")
              "")
            ws-test-port url))
@@ -198,11 +198,16 @@ 
org=-+one%0A-+two%0A-+three%0A-+four%0A%0A&beg=646&end=667&path=%2Fcomplex.org")
   (mapc (lambda (pair)
           (let ((should-or-not (car pair))
                 (dir (cdr pair)))
+            (message "dir: %S" dir)
             (should
              (funcall (if should-or-not #'identity #'not)
                       (ws-in-directory-p temporary-file-directory dir)))))
         `((nil . "foo/bar/../../../")
-          (t   . ,(concat "foo/bar/../../../" temporary-file-directory "/baz"))
+          (t   . ,(concat
+                   "foo/bar/../../../"
+                   (file-name-nondirectory
+                    (directory-file-name temporary-file-directory))
+                   "/baz"))
           (t   . "./")
           (nil . "/~/pics")
           (nil . "~/pics")