Fix failing test cases on Windows (#111)

.gitattributes

@@ -7,3 +7,6 @@
 # Ensure all lua files use LF
 *.lua  eol=lf
 *.luau eol=lf
+
+# Ensure all txt files within tests use LF
+tests/**/*.txt eol=lf

src/lune/builtins/process/options.rs

@@ -98,7 +98,7 @@ impl<'lua> FromLua<'lua> for ProcessSpawnOptions {
             LuaValue::Boolean(true) => {
                 this.shell = match env::consts::FAMILY {
                     "unix" => Some("/bin/sh".to_string()),
-                    "windows" => Some("/bin/sh".to_string()),
+                    "windows" => Some("powershell".to_string()),
                     _ => None,
                 };
             }

tests/net/serve/requests.luau

@@ -52,7 +52,8 @@ if not success then
 	assert(
 		string.find(message, "Connection reset")
 			or string.find(message, "Connection closed")
-			or string.find(message, "Connection refused"),
+			or string.find(message, "Connection refused")
+			or string.find(message, "No connection could be made"), -- Windows Request Error
 		"Server did not stop responding to requests"
 	)
 else

tests/process/spawn.luau

@@ -10,9 +10,17 @@ local thread = task.delay(1, function()
 	process.exit(1)
 end)
 
-local result = process.spawn("ls", {
-	"-a",
-})
+local isWindows = process.os == "windows";
+
+-- To run windows command, we need to launch cmd.exe and pass the command as an argument.
+local result = process.spawn(
+	if isWindows then "cmd" else "ls",
+	if isWindows then {
+		"/c", "dir"
+	} else {
+		"-a"
+	}
+)
 
 task.cancel(thread)
 
@@ -27,7 +35,7 @@ assert(string.find(result.stdout, ".gitignore") ~= nil, "Missing .gitignore in o
 -- It should also work the same when spawned using a shell
 
 local shellResult = process.spawn("ls", {
-	"-a",
+	if isWindows then "-Force" else "-a"
 }, {
 	shell = true,
 })
@@ -40,30 +48,34 @@ assert(shellResult.stdout ~= "", "Stdout was empty (shell)")
 assert(string.find(shellResult.stdout, "Cargo.toml") ~= nil, "Missing Cargo.toml in output (shell)")
 assert(string.find(shellResult.stdout, ".gitignore") ~= nil, "Missing .gitignore in output (shell)")
 
+local pwdCommand = if isWindows then "cmd" else "pwd"
+local pwdArgs = if isWindows then { "/c", "cd" } else {}
 -- Make sure the cwd option actually uses the directory we want
-local rootPwd = process.spawn("pwd", {}, {
+local rootPwd = process.spawn(pwdCommand, pwdArgs, {
 	cwd = "/",
 }).stdout
 rootPwd = string.gsub(rootPwd, "^%s+", "")
 rootPwd = string.gsub(rootPwd, "%s+$", "")
-if rootPwd ~= "/" then
+-- Windows: <Drive Letter>:\, Unix: /
+local expectedRootPwd = if isWindows then string.sub(rootPwd, 1, 1) .. ":\\" else "/"
+if rootPwd ~= expectedRootPwd then
 	error(
 		string.format(
 			"Current working directory for child process was not set correctly!"
-				.. "\nExpected '/', got '%s'",
-			rootPwd
+				.. "\nExpected '%s', got '%s'",
+			expectedRootPwd, rootPwd
 		)
 	)
 end
 
 -- Setting cwd should not change the cwd of this process
 
-local pwdBefore = process.spawn("pwd").stdout
+local pwdBefore = process.spawn(pwdCommand, pwdArgs).stdout
 process.spawn("ls", {}, {
 	cwd = "/",
 	shell = true,
 })
-local pwdAfter = process.spawn("pwd").stdout
+local pwdAfter = process.spawn(pwdCommand, pwdArgs).stdout
 assert(pwdBefore == pwdAfter, "Current working directory changed after running child process")
 
 --[[
@@ -74,7 +86,10 @@ assert(pwdBefore == pwdAfter, "Current working directory changed after running c
 local homeDir1 = process.spawn("echo $HOME", nil, {
 	shell = true,
 }).stdout
-local homeDir2 = process.spawn("pwd", nil, {
+
+-- Powershell for windows uses `$pwd.Path` instead of `pwd` as pwd would return a PathInfo object,
+-- using $pwd.Path gets the Path property of the PathInfo object.
+local homeDir2 = process.spawn(if isWindows then "$pwd.Path" else "pwd", nil, {
 	shell = true,
 	cwd = "~",
 }).stdout
@@ -94,7 +109,10 @@ assert(homeDir1 == homeDir2, "Home dirs did not match when performing tilde subs
 local SLEEP_DURATION = 1 / 4
 local SLEEP_SAMPLES = 2
 
-local thread2 = task.delay(SLEEP_DURATION * 1.5, function()
+-- Windows tend to have a higher execution time
+local yieldTolarance = if isWindows then 25 else SLEEP_DURATION * 1.5;
+
+local thread2 = task.delay(yieldTolarance, function()
 	stdio.ewrite("Spawning a sleep process should take a reasonable amount of time\n")
 	task.wait(1)
 	process.exit(1)
@@ -104,7 +122,16 @@ local sleepStart = os.clock()
 local sleepCounter = 0
 for i = 1, SLEEP_SAMPLES, 1 do
 	task.spawn(function()
-		process.spawn("sleep", { tostring(SLEEP_DURATION) })
+		local args = {
+			-- Sleep command on Windows in Seconds has some weird behavior with decimals...
+			tostring(SLEEP_DURATION * (isWindows and 1000 or 1))
+		};
+		if isWindows then
+			-- ... so we use milliseconds instead.
+			table.insert(args, 1, "-Milliseconds");
+		end
+		-- Windows does not have `sleep` as a process, so we use powershell instead.
+		process.spawn("sleep", args, if isWindows then { shell = true } else nil)
 		sleepCounter += 1
 	end)
 end
@@ -115,12 +142,13 @@ end
 task.cancel(thread2)
 
 local sleepElapsed = os.clock() - sleepStart
+
 assert(
 	sleepElapsed >= SLEEP_DURATION,
 	"Spawning a process that does blocking sleep did not sleep enough"
 )
 assert(
-	sleepElapsed < SLEEP_DURATION * 1.5,
+	sleepElapsed < yieldTolarance,
 	"Coroutine yielded the main lua thread during process yield"
 )
 
@@ -128,13 +156,16 @@ assert(
 
 local echoMessage = "Hello from child process!"
 local echoResult = process.spawn("echo", {
-	'"$TEST_VAR"',
+	if isWindows then '"$Env:TEST_VAR"' else '"$TEST_VAR"',
 }, {
 	env = { TEST_VAR = echoMessage },
-	shell = "bash",
+	shell = if isWindows then "powershell" else "bash", -- "bash" does not exist on Windows, using "powershell" instead.
 	stdio = "inherit",
 })
+
+-- Windows echo adds a \r before the newline
+local trailingAddition = if isWindows then "\r\n" else "\n"
 assert(
-	echoResult.stdout == (echoMessage .. "\n"), -- Note that echo adds a newline
+	echoResult.stdout == (echoMessage .. trailingAddition), -- Note that echo adds a newline
 	"Inheriting stdio did not return proper output"
 )