fix polling test on CI

webpack · Jan 8, 2019 · f1449f0 · f1449f0
1 parent d1dafe2
commit f1449f0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -17,6 +17,12 @@ jobs:
         node-10-poll:
           node_version: ^10.10.0
           polling: 200
+        node-8-poll:
+          node_version: ^8.12.0
+          polling: 200
+        node-6-poll:
+          node_version: ^6.16.0
+          polling: 200
     steps:
       - task: NodeTool@0
         inputs:
@@ -99,6 +105,12 @@ jobs:
         node-10-poll:
           node_version: ^10.10.0
           polling: 200
+        node-8-poll:
+          node_version: ^8.12.0
+          polling: 200
+        node-6-poll:
+          node_version: ^6.16.0
+          polling: 200
     steps:
       - task: NodeTool@0
         inputs:

diff --git a/lib/DirectoryWatcher.js b/lib/DirectoryWatcher.js
@@ -75,7 +75,6 @@ class DirectoryWatcher extends EventEmitter {
 
 	createWatcher() {
 		try {
-			const options = this.options;
 			// TODO options.ignored
 			if(this.polledWatching) {
 				const listener = this.onWatchFileEvent.bind(this);

diff --git a/test/DirectoryWatcher.test.js b/test/DirectoryWatcher.test.js
@@ -161,7 +161,7 @@ describe("DirectoryWatcher", function() {
 		});
 	});
 
-	if(!process.env.WATCHPACK_POLLING) {
+	if(!+process.env.WATCHPACK_POLLING) {
 		it("should log errors emitted from watcher to stderr", function(done) {
 			var error_logged = false;
 			var old_stderr = process.stderr.write

diff --git a/test/Watchpack.js b/test/Watchpack.js
@@ -610,12 +610,14 @@ describe("Watchpack", function() {
 		w.on("aggregated", function(changes, removals) {
 			step.should.be.eql(6);
 			Array.from(removals).sort().should.be.eql([path.join(fixtures, "a"), path.join(fixtures, "b")]);
-			removeEvents.should.be.eql([
-				path.join(fixtures, "a"),
-				path.join(fixtures, "b"),
-				path.join(fixtures, "a"),
-				path.join(fixtures, "b"),
-			]);
+			if(!+process.env.WATCHPACK_POLLING) {
+				removeEvents.should.be.eql([
+					path.join(fixtures, "a"),
+					path.join(fixtures, "b"),
+					path.join(fixtures, "a"),
+					path.join(fixtures, "b"),
+				]);
+			}
 			Object.keys(w.getTimes()).sort().should.be.eql([
 				path.join(fixtures, "a"),
 				path.join(fixtures, "b")