fix for waiting on job to transition to running when it has already stopped

Author: sanfilip

lib/jobs/waitfor.js

@@ -72,12 +72,13 @@ function waitfor(params, cb) {
 			return cb(new Error('state must be either Pending, Running, Stopped, Failed, or Error'));
 	}
 	return method(waitfor, params, function _cb(err, job) {
-		if (err) {
-			return cb(err);
-		}
-		if (job && (job.state === targetState || job.state === 'Error'
-			|| (job.state === 'Stopped' && params.state === 'Failed')
-			|| (job.state === 'Failed' && params.state === 'Stopped'))) {
+		if (err) return cb(err);
+		if (!job) return cb(new Error('Job not found'));
+		if (job.state === targetState ||
+			(job.state === 'Running' && params.state === 'Pending') ||
+			job.state === 'Error' ||
+			job.state === 'Stopped' ||
+			job.state === 'Failed') {
 			return cb(null, job);
 		}
 		var interval = setTimeout(function _interval() {