scheduler, task_pool, task_proxy refactor

Fixes following merge with cylc#2220.

lib/cylc/task_job_mgr.py

@@ -437,14 +437,7 @@ def _get_job_scripts(itask, rtconfig):
         script = rtconfig['script']
         pre_script = rtconfig['pre-script']
         post_script = rtconfig['post-script']
-        if itask.tdef.run_mode == 'dummy':
-            # Use dummy script items in dummy mode.
-            script = rtconfig['dummy mode']['script']
-            if rtconfig['dummy mode']['disable pre-script']:
-                pre_script = None
-            if rtconfig['dummy mode']['disable post-script']:
-                post_script = None
-        elif itask.tdef.suite_polling_cfg:
+        if itask.tdef.suite_polling_cfg:
             # Automatic suite state polling script
             comstr = "cylc suite-state " + \
                      " --task=" + itask.tdef.suite_polling_cfg['task'] + \
@@ -734,6 +727,11 @@ def _simulation_submit_task_jobs(self, itasks):
         """Simulation mode task jobs submission."""
         for itask in itasks:
             self._set_retry_timers(itask)
+            itask.task_host = 'SIMULATION'
+            itask.task_owner = 'SIMULATION'
+            itask.summary['batch_sys_name'] = 'SIMULATION'
+            itask.summary['execution_time_limit'] = (
+                itask.tdef.rtconfig['job']['simulated run length'])
             self.task_events_mgr.process_message(
                 itask, INFO, TASK_OUTPUT_SUBMITTED)
 

lib/cylc/task_pool.py

@@ -1144,9 +1144,11 @@ def sim_time_check(self, message_queue):
                 continue
             timeout = (itask.summary['started_time'] +
                        itask.tdef.rtconfig['job']['simulated run length'])
-            if time.time() > timeout:
-                # Time up.
-                if itask.sim_job_fail():
+            if time() > timeout:
+                conf = itask.tdef.rtconfig['simulation']
+                if (itask.point in conf['fail cycle points'] and
+                        (itask.get_try_num() == 1 or
+                         not conf['fail try 1 only'])):
                     message_queue.put(
                         itask.identity, 'CRITICAL', TASK_STATUS_FAILED)
                 else: