Fix unable to cancel scheduled and non-scheduled builds (#234)

* Fix unable to cancel scheduled and non-scheduled builds

* Removed no longer valid test case

Author: Skarlso

workers/scheduler/scheduler.go

@@ -350,8 +350,8 @@ func (s *Scheduler) StopPipelineRun(p *gaia.Pipeline, runID int) error {
 	if err != nil {
 		return err
 	}
-	if pr.Status != gaia.RunRunning {
-		return errors.New("pipeline is not in running state")
+	if pr.Status == gaia.RunFailed || pr.Status == gaia.RunCancelled || pr.Status == gaia.RunSuccess {
+		return errors.New("pipeline is not in a cancellable state")
 	}
 
 	pr.Status = gaia.RunCancelled

workers/scheduler/scheduler_test.go

@@ -532,49 +532,6 @@ func TestSetPipelineJobs(t *testing.T) {
 	}
 }
 
-func TestStopPipelineRunFailIfPipelineNotInRunningState(t *testing.T) {
-	gaia.Cfg = &gaia.Config{}
-	storeInstance := store.NewBoltStore()
-	tmp, _ := ioutil.TempDir("", "TestStopPipelineRunFailIfPipelineNotInRunningState")
-	gaia.Cfg.DataPath = tmp
-	gaia.Cfg.WorkspacePath = filepath.Join(tmp, "tmp")
-	gaia.Cfg.Bolt.Mode = 0600
-	gaia.Cfg.Logger = hclog.New(&hclog.LoggerOptions{
-		Level:  hclog.Trace,
-		Output: hclog.DefaultOutput,
-		Name:   "Gaia",
-	})
-	gaia.Cfg.Worker = 2
-	if err := storeInstance.Init(tmp); err != nil {
-		t.Fatal(err)
-	}
-	p, _ := prepareTestData()
-	_ = storeInstance.PipelinePut(&p)
-	s, err := NewScheduler(storeInstance, &MemDBFake{}, &PluginFakeFailed{}, &CAFake{}, &VaultFake{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = s.SchedulePipeline(&p, prepareArgs())
-	if err != nil {
-		t.Fatal(err)
-	}
-	s.schedule()
-	r, err := storeInstance.PipelineGetRunByPipelineIDAndID(p.ID, 1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.Status != gaia.RunScheduled {
-		t.Fatalf("run has status %s but should be %s\n", r.Status, string(gaia.RunScheduled))
-	}
-	err = s.StopPipelineRun(&p, 1)
-	if err == nil {
-		t.Fatal("error was nil. should have failed")
-	}
-	if err.Error() != "pipeline is not in running state" {
-		t.Fatal("error was not what was expected 'pipeline is not in running state'. got: ", err.Error())
-	}
-}
-
 func TestStopPipelineRun(t *testing.T) {
 	gaia.Cfg = &gaia.Config{}
 	storeInstance := store.NewBoltStore()