The unified diff between revisions [24fb0b25..] and [8032bf83..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'tests/non_workspace_keydir/__driver__.lua'

#
#
# patch "tests/non_workspace_keydir/__driver__.lua"
#  from [d32720e0e63d4429dc590c0849a1eb8794848b06]
#    to [09163eaea1e4184fffae4bf8b8719aa3711a43ec]
#
============================================================
--- tests/non_workspace_keydir/__driver__.lua	d32720e0e63d4429dc590c0849a1eb8794848b06
+++ tests/non_workspace_keydir/__driver__.lua	09163eaea1e4184fffae4bf8b8719aa3711a43ec
@@ -27,17 +27,17 @@ end
 expected_ret = -15
 end

--- srv = bg(pure_mtn("serve", "--confdir="..test.root, "--keydir="..test.root.."/keys"), expected_ret, false, true)
--- sleep(2)
--- srv:finish()
--- check(qgrep("beginning service", "stderr"))
+srv = bg(pure_mtn("serve", "--confdir="..test.root, "--keydir="..test.root.."/keys"), expected_ret, false, true)
+sleep(2)
+srv:finish()
+check(qgrep("beginning service", "stderr"))

 -- this should find a private key in the keys directory under the specified confdir

--- srv = bg(pure_mtn("serve", "--confdir="..test.root), expected_ret, false, true)
--- sleep(2)
--- srv:finish()
--- check(qgrep("beginning service", "stderr"))
+srv = bg(pure_mtn("serve", "--confdir="..test.root), expected_ret, false, true)
+sleep(2)
+srv:finish()
+check(qgrep("beginning service", "stderr"))

 -- this should fail to decrypt the private key found in ~/.monotone/keys

@@ -50,7 +50,11 @@ mkdir(test.root.."/empty")
 mkdir(test.root.."/empty")
 -- FIXME: this should probably be set globally in lua-testsuite.lua for
 --        all tests.
+if ostype == "Windows" then
+set_env("APPDATA", test.root.."/empty")
+else
 set_env("HOME", test.root.."/empty")
+end
 srv = bg(pure_mtn("serve"), 1, false, true)
 sleep(2)
 srv:finish()