Server: Remove unnecessary worker check

Author: jzaefferer

lib/server.js

@@ -226,42 +226,39 @@ exports.Server = function Server(bsClient, workers) {
         config.status += query.failed;
       }
 
-      // TODO remove this check, must always be true due to `worker` usage above
-      if (worker) {
-        bsClient.takeScreenshot(worker.id, function(error, screenshot) {
-          if (!error && screenshot.url && query && query.failed) {
-            logger.info('[%s] ' + chalk.yellow('Screenshot:') + ' %s', getTestBrowserInfo(worker), screenshot.url);
-          }
-
-          checkAndTerminateWorker(worker, function(reusedWorker) {
-            if (!workers[uuid]) {
-              return;
-            }
+      bsClient.takeScreenshot(worker.id, function(error, screenshot) {
+        if (!error && screenshot.url && query && query.failed) {
+          logger.info('[%s] ' + chalk.yellow('Screenshot:') + ' %s', getTestBrowserInfo(worker), screenshot.url);
+        }
 
-            if (reusedWorker) {
-              logger.debug('[%s] Reused', getTestBrowserInfo(worker));
-              return;
-            }
+        checkAndTerminateWorker(worker, function(reusedWorker) {
+          if (!workers[uuid]) {
+            return;
+          }
 
-            logger.debug('[%s] Terminated', getTestBrowserInfo(worker));
+          if (reusedWorker) {
+            logger.debug('[%s] Reused', getTestBrowserInfo(worker));
+            return;
+          }
 
-            clearTimeout(workers[uuid].activityTimeout);
-            clearTimeout(workers[uuid].testActivityTimeout);
-            delete workers[uuid];
+          logger.debug('[%s] Terminated', getTestBrowserInfo(worker));
 
-            if (utils.objectSize(workers) === 0) {
-              var color = config.status > 0 ? "red" : "green";
-              logger.info(chalk[color]("All tests done, failures: %d."), config.status);
+          clearTimeout(workers[uuid].activityTimeout);
+          clearTimeout(workers[uuid].testActivityTimeout);
+          delete workers[uuid];
 
-              if (config.status > 0) {
-                config.status = 1;
-              }
+          if (utils.objectSize(workers) === 0) {
+            var color = config.status > 0 ? "red" : "green";
+            logger.info(chalk[color]("All tests done, failures: %d."), config.status);
 
-              process.kill(process.pid, 'SIGTERM');
+            if (config.status > 0) {
+              config.status = 1;
             }
-          });
+
+            process.kill(process.pid, 'SIGTERM');
+          }
         });
-      }
+      });
 
       response.end();
     },