Changeset 6433

Timestamp:

Mar 14, 2014, 9:04:02 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1796: Improve support for jobs running on external servers

Fixed issues with jobs in UNCONFIGURED state in the test code.

Location:

trunk

Files:

• doc/src/docbook/appendix/incompatible.xml (modified) (1 diff)
• src/test/TestJobAgent.java (modified) (1 diff)
• src/test/TestPluginDefinition.java (modified) (1 diff)
• src/test/net/sf/basedb/test/PluginUtil.java (modified) (1 diff)

trunk/doc/src/docbook/appendix/incompatible.xml

@@ -104 +104 @@
       wrapper extension, but the recommendation is to update those plug-in to the
       new system. See <xref linkend="extensions_developer.login-manager" /> for more information.
+    </para>
+    
+    <bridgehead>Setting parameters for a job no longer set it to status=WAITING</bridgehead>
+    <para>
+      Added <methodname>Job.setScheduled()</methodname> to switch the state
+      from <constant>UNCONFIGURED</constant> to <constant>WAITING</constant>. 
+      A job can't be executed before it has entered the <constant>WAITING</constant>
+      state. The change makes it possible to register a job and some parameters for
+      it and remain in the <constant>UNCONFIGURED</constant> state.
     </para>
     

trunk/src/test/TestJobAgent.java

@@ -363 +363 @@
       Job job = Job.getNew(dc, plugin, null, null);
       job.setName(plugin.getName());
-      job.setParameterValue("dummy", new StringParameterType(), "dummy"); // To end up with status = WAITING
+      job.setParameterValue("dummy", new StringParameterType(), "dummy");
+      job.setScheduled(null, JobAgent.getById(dc, agentId)); // To end up with status = WAITING
       dc.saveItem(job);
       dc.commit();

trunk/src/test/TestPluginDefinition.java

@@ -281 +281 @@
       job.setParameterValue("shouldFail", new BooleanParameterType(), shouldFail);
       job.setParameterValue("numNews", new IntegerParameterType(), numNews);
+      job.setScheduled(null, null);
       dc.saveItem(job);
       dc.commit();

trunk/src/test/net/sf/basedb/test/PluginUtil.java

@@ -144 +144 @@
     DbControl dc = TestUtil.getDbControl();
     job = Job.getById(dc, job.getId());
+    if (job.getStatus() == Job.Status.UNCONFIGURED)
+    {
+      job.setScheduled(null, null);
+    }
     PluginExecutionRequest request = 
       job.execute(new ConsoleProgressReporter(false), TestUtil.getLocalIp());