state: remove ProposedTools.

cmd/jujud/upgrade.go

 package main
 
 import (
         "fmt"
         "launchpad.net/juju-core/downloader"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/log"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/state/watcher"
         "launchpad.net/juju-core/version"
         "launchpad.net/juju-core/worker"
         "launchpad.net/tomb"
         "os"
-)
-
-// testing hooks
-var (
-        // invalidVersion is called when an invalid version has been proposed.
-        invalidVersion = func() {}
-        // sameVersion is called when a version has been proposed, but
-        // only the same version can be found.
-        sameVersion = func() {}
 )
 
 // An Upgrader observes the version information for an agent in the
 // environment state, and handles the downloading and unpacking of
 // new versions of the juju tools when necessary.
 //
 // When a new version is available Wait and Stop return UpgradedError.
 type Upgrader struct {
         tomb       tomb.Tomb
         st         *state.State
@@ skipping 107 matching lines @@
                         binary.Number = vers
 
                         if tools, err := environs.ReadTools(binary); err == nil {
                                 // The tools have already been downloaded, so use them.
                                 return &UpgradedError{tools}
                         }
                         // TODO(rog) add support for environs.DevVersion
                         tools, err := environs.FindTools(environ, binary, environs.CompatVersion)
                         if err != nil {
                                 log.Printf("upgrader: error finding tools for %v: %v", binary, err)
-                                invalidVersion()
                                 // TODO(rog): poll until tools become available.
                                 break
                         }
                         if tools.Binary != binary {
                                 if tools.Number == version.Current.Number {
                                         // TODO(rog): poll until tools become available.
                                         log.Printf("upgrader: version %v requested but no newer version found", binary)
-                                        sameVersion()
                                         break
                                 }
                                 log.Printf("upgrader: cannot find exact tools match for %s; using %s instead", binary, tools.Binary)
                         }
                         download = downloader.New(tools.URL, "")
                         downloadTools = tools
                         downloadDone = download.Done()
                 case status := <-downloadDone:
                         tools := downloadTools
                         download, downloadTools, downloadDone = nil, nil, nil
@@ skipping 10 matching lines @@
                                 log.Printf("upgrader: cannot unpack %v tools: %v", tools.Binary, err)
                                 break
                         }
                         return &UpgradedError{tools}
                 case <-u.tomb.Dying():
                         return nil
                 }
         }
         panic("not reached")
 }