Revert "Simplified interaction between scheduler and control"

README.md

@@ -230,7 +230,6 @@ Documentation for Snap will be kept in this repository for now with an emphasis
 * [build and test](docs/BUILD_AND_TEST.md)
 * [REST API](docs/REST_API.md)
 * [tasks](docs/TASKS.md)
-* [plugin life cycle](docs/PLUGIN_LIFECYCLE.md)
 * [plugin signing](docs/PLUGIN_SIGNING.md)
 * [tribe](docs/TRIBE.md)
 

control/available_plugin.go

@@ -54,7 +54,6 @@ const (
 var (
 	ErrPoolNotFound = errors.New("plugin pool not found")
 	ErrBadKey       = errors.New("bad key")
-	ErrBadTaskId    = errors.New("bad task id")
 )
 
 // availablePlugin represents a plugin which is
@@ -539,8 +538,6 @@ func (ap *availablePlugins) findLatestPool(pType, name string) (strategy.Pool, s
 }
 
 func (ap *availablePlugins) getOrCreatePool(key string) (strategy.Pool, error) {
-	ap.Lock()
-	defer ap.Unlock()
 	var err error
 	pool, ok := ap.table[key]
 	if ok {

control/available_plugin_test.go

@@ -53,7 +53,6 @@ func TestAvailablePlugin(t *testing.T) {
 	Convey("Stop()", t, func() {
 		Convey("returns nil if plugin successfully stopped", func() {
 			r := newRunner()
-			r.SetEmitter(new(MockEmitter))
 			a := plugin.Arg{
 				PluginLogPath: "/tmp/snap-test-plugin-stop.log",
 			}