Merge pull request #336 from ardias/add-list-jobs-method

dbus: add ListJobs method

Author: Luca Bruno

dbus/methods.go

@@ -598,3 +598,42 @@ func unitPath(name string) dbus.ObjectPath {
 func unitName(dpath dbus.ObjectPath) string {
 	return pathBusUnescape(path.Base(string(dpath)))
 }
+
+// Currently queued job definition
+type JobStatus struct {
+	Id       uint32          // The numeric job id
+	Unit     string          // The primary unit name for this job
+	JobType  string          // The job type as string
+	Status   string          // The job state as string
+	JobPath  dbus.ObjectPath // The job object path
+	UnitPath dbus.ObjectPath // The unit object path
+}
+
+// ListJobs returns an array with all currently queued jobs
+func (c *Conn) ListJobs() ([]JobStatus, error) {
+	return c.listJobsInternal()
+}
+
+func (c *Conn) listJobsInternal() ([]JobStatus, error) {
+	result := make([][]interface{}, 0)
+	if err := c.sysobj.Call("org.freedesktop.systemd1.Manager.ListJobs", 0).Store(&result); err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	status := make([]JobStatus, len(result))
+	statusInterface := make([]interface{}, len(status))
+	for i := range status {
+		statusInterface[i] = &status[i]
+	}
+
+	if err := dbus.Store(resultInterface, statusInterface...); err != nil {
+		return nil, err
+	}
+
+	return status, nil
+}

dbus/methods_test.go

@@ -132,6 +132,19 @@ func runStopUnit(t *testing.T, conn *Conn, trTarget TrUnitProp) error {
 	return nil
 }
 
+func getJobStatusIfExists(jobs []JobStatus, jobName string) *JobStatus {
+	for _, j := range jobs {
+		if j.Unit == jobName {
+			return &j
+		}
+	}
+	return nil
+}
+
+func isJobStatusEmpty(job JobStatus) bool {
+	return job.Id == 0 && job.Unit == "" && job.JobType == "" && job.Status == "" && job.JobPath == "" && job.UnitPath == ""
+}
+
 // Ensure that basic unit starting and stopping works.
 func TestStartStopUnit(t *testing.T) {
 	target := "start-stop.service"
@@ -642,6 +655,54 @@ func TestEnableDisableUnit(t *testing.T) {
 	}
 }
 
+// Ensure that ListJobs works.
+func TestListJobs(t *testing.T) {
+	service := "oneshot.service"
+
+	conn := setupConn(t)
+
+	setupUnit(service, conn, t)
+	linkUnit(service, conn, t)
+
+	_, err := conn.StartUnit(service, "replace", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	jobs, err := conn.ListJobs()
+	if err != nil {
+		t.Skip(err)
+	}
+
+	found := getJobStatusIfExists(jobs, service)
+	if found == nil {
+		t.Fatalf("%s job not found in list", service)
+	}
+
+	if isJobStatusEmpty(*found) {
+		t.Fatalf("empty %s job found in list", service)
+	}
+
+	reschan := make(chan string)
+	_, err = conn.StopUnit(service, "replace", reschan)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	<-reschan
+
+	jobs, err = conn.ListJobs()
+
+	found = getJobStatusIfExists(jobs, service)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if found != nil {
+		t.Fatalf("%s job found in list when it shouldn't", service)
+	}
+}
+
 // TestSystemState tests if system state is one of the valid states
 func TestSystemState(t *testing.T) {
 	conn := setupConn(t)

fixtures/oneshot.service

@@ -0,0 +1,7 @@
+[Unit]
+Description=start stop test
+
+[Service]
+ExecStart=/bin/sh sleep 400
+ExecStopPost=/bin/sh sleep 1000
+Type=oneshot