Merge branch 'master' into dev

tests/DMAPI/LongRunning/PreCompile-GenerateRandomResource.bat

@@ -0,0 +1,4 @@
+cd /D "%~dp0"
+cd %1
+cd tests\DMAPI\LongRunning
+C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -ExecutionPolicy Bypass -Command "(New-Guid).Guid | Out-File resource.txt; Add-Content -Path resource.txt -Value 'aljsdhfjahsfkjnsalkjdfhskljdackmcnvxkljhvkjsdanv,jdshlkufhklasjeFDhfjkalhdkjlfhalksfdjh'"

tests/DMAPI/LongRunning/PreCompile-GenerateRandomResource.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+cd "$1/tests/DMAPI/LongRunning"
+
+tr -dc A-Za-z0-9 </dev/urandom | head -c 13 > resource.txt
+echo -e '\naljsdhfjahsfkjnsalkjdfhskljdackmcnvxkljhvkjsdanv,jdshlkufhklasjeFDhfjkalhdkjlfhalksfdjh\n' >> resource.txt

tests/DMAPI/LongRunning/Test.dm

@@ -28,11 +28,13 @@
 		if(!length(channels))
 			FailTest("Expected some chat channels!")
 
-	var/test_str = "aljsdhfjahsfkjnsalkjdfhskljdackmcnvxkljhvkjsdanv,jdshlkufhklasjeFDhfjkalhdkjlfhalksfdjh"
-	var/res_contents = file2text('resource.txt') // we need a .rsc to be generated
+	var/res = file('resource.txt')
+	if(!res)
+		FailTest("Failed to resource!")
 
-	if(!findtext(res_contents, test_str))
-		FailTest("Failed to resource? Did not find magic: [res_contents]")
+	var/res_contents = file2text(res) // we need a .rsc to be generated
+	if(!res_contents)
+		FailTest("Failed to resource? No contents!")
 
 	if(!fexists("[DME_NAME].rsc"))
 		FailTest("Failed to create .rsc!")

tests/DMAPI/LongRunning/resource.txt

@@ -1,8 +0,0 @@
-
-		if(!length(channels))
-			FailTest("Expected some chat channels!")
-
-	var/test_str = "aljsdhfjahsfkjnsalkjdfhskljdackmcnvxkljhvkjsdanv,jdshlkufhklasjeFDhfjkalhdkjlfhalksfdjh"
-	var/self_contents = file2text(file('Test.dm')) // we need a .rsc to be generated
-
-	if(!(test_str in self_contents))