Enable labels filter test and improve logging

Author: taraspos

cli/docker-labels_test.go

@@ -45,13 +45,15 @@ func (s *TestDockerSuit) TestLabelsFilterJobsCount(c *check.C) {
 		{
 			requiredLabel:  "true",
 			filterLabel[0]: filterLabel[1],
-			labelPrefix + "." + jobExec + ".job2.schedule": "schedule2",
-			labelPrefix + "." + jobExec + ".job2.command":  "command2",
+			labelPrefix + "." + jobExec + ".job2.schedule":  "* * * * *",
+			labelPrefix + "." + jobExec + ".job2.command":   "command2",
+			labelPrefix + "." + jobExec + ".job2.container": "container2",
 		},
 		{
 			requiredLabel: "true",
-			labelPrefix + "." + jobExec + ".job3.schedule": "schedule3",
-			labelPrefix + "." + jobExec + ".job3.command":  "command3",
+			labelPrefix + "." + jobExec + ".job3.schedule":  "* * * * *",
+			labelPrefix + "." + jobExec + ".job3.command":   "command3",
+			labelPrefix + "." + jobExec + ".job3.container": "container3",
 		},
 	}
 
@@ -62,7 +64,6 @@ func (s *TestDockerSuit) TestLabelsFilterJobsCount(c *check.C) {
 	c.Assert(err, check.IsNil)
 	c.Assert(scheduler, check.NotNil)
 
-	c.Skip("This test will not work until https://github.com/fsouza/go-dockerclient/pull/1031 is merged")
 	c.Assert(scheduler.Jobs, check.HasLen, 1)
 }
 

core/scheduler.go

@@ -31,17 +31,18 @@ func NewScheduler(l Logger) *Scheduler {
 }
 
 func (s *Scheduler) AddJob(j Job) error {
-	s.Logger.Noticef("New job registered %q - %q - %q", j.GetName(), j.GetCommand(), j.GetSchedule())
-
 	if j.GetSchedule() == "" {
 		return ErrEmptySchedule
 	}
 
 	err := s.cron.AddJob(j.GetSchedule(), &jobWrapper{s, j})
 	if err != nil {
+		s.Logger.Warningf("Failed to register job %q - %q - %q", j.GetName(), j.GetCommand(), j.GetSchedule())
 		return err
 	}
 
+	s.Logger.Noticef("New job registered %q - %q - %q", j.GetName(), j.GetCommand(), j.GetSchedule())
+
 	s.Jobs = append(s.Jobs, j)
 	return nil
 }