Move slowTest into test/integration/index

Deduplicate slowTest into the shared integration test library.

test/integration/clusterio.js

@@ -4,18 +4,7 @@ const path = require("path");
 const validateHTML = require('html5-validator');
 const parallel = require('mocha.parallel');
 
-const { get, exec, controlConfigPath, instancesDir } = require("./index");
-
-
-// Mark that this test takes a lot of time, or depeneds on a test
-// that takes a lot of time.
-function slowTest(test) {
-	if (process.env.FAST_TEST) {
-		test.skip();
-	}
-
-	test.timeout(20000);
-}
+const { slowTest, get, exec, controlConfigPath, instancesDir } = require("./index");
 
 
 describe("Integration of Clusterio", function() {

test/integration/index.js

@@ -9,6 +9,16 @@ const events = require("events");
 const server = require("lib/factorio/server");
 
 
+// Mark that this test takes a lot of time, or depeneds on a test
+// that takes a lot of time.
+function slowTest(test) {
+	if (process.env.FAST_TEST) {
+		test.skip();
+	}
+
+	test.timeout(20000);
+}
+
 async function get(path) {
 	let res = await needle("get", `https://localhost:4443${path}`, { rejectUnauthorized: false });
 	if (res.statusCode != 200) {
@@ -97,6 +107,7 @@ after(async function() {
 
 
 module.exports = {
+	slowTest,
 	get,
 	exec,
 

test/integration/patch.js

@@ -5,18 +5,13 @@ const path = require("path");
 
 const factorio = require("lib/factorio");
 
+const { slowTest } = require("./index");
+
 
 // The server integration test is required to run before this one
 require("./server")
 
 describe("Integration of lib/factorio/patch", function() {
-	// Mark that this test depeneds on a test that takes a lot of time.
-	function slowTest(test) {
-		if (process.env.FAST_TEST) {
-			test.skip();
-		}
-	}
-
 	describe("patch()", function() {
 		let savePath = path.join("test", "temp", "integration", "saves", "test.zip");
 		it("should patch a freeplay game", async function() {

test/integration/server.js

@@ -6,6 +6,8 @@ const path = require("path");
 const factorio = require("lib/factorio");
 const errors = require("lib/errors");
 
+const { slowTest } = require("./index");
+
 
 describe("Integration of lib/factorio/server", function() {
 	describe("_getVersion()", function() {
@@ -67,16 +69,6 @@ describe("Integration of lib/factorio/server", function() {
 			});
 		});
 
-		// Mark that this test takes a lot of time, or depeneds on a test
-		// that takes a lot of time.
-		function slowTest(test) {
-			if (process.env.FAST_TEST) {
-				test.skip();
-			}
-
-			test.timeout(20000);
-		}
-
 		function log(message) {
 			logFile.write("=================== " + message + "\n");
 		}