worker;cmd/jujud: Replace uniter with apiuniter

worker/apiuniter/charm/charm_test.go

Index: worker/apiuniter/charm/charm_test.go
=== removed file 'worker/apiuniter/charm/charm_test.go'
--- worker/apiuniter/charm/charm_test.go	2013-09-11 09:09:15 +0000
+++ worker/apiuniter/charm/charm_test.go	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-// Copyright 2012, 2013 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package charm_test
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path/filepath"
-	stdtesting "testing"
-	"time"
-
-	gc "launchpad.net/gocheck"
-
-	corecharm "launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/juju/testing"
-	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/uniter"
-	coretesting "launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/testing/checkers"
-	"launchpad.net/juju-core/worker/apiuniter/charm"
-)
-
-func TestPackage(t *stdtesting.T) {
-	coretesting.MgoTestPackage(t)
-}
-
-type BundlesDirSuite struct {
-	coretesting.HTTPSuite
-	testing.JujuConnSuite
-
-	st     *api.State
-	uniter *uniter.State
-}
-
-var _ = gc.Suite(&BundlesDirSuite{})
-
-func (s *BundlesDirSuite) SetUpSuite(c *gc.C) {
-	s.HTTPSuite.SetUpSuite(c)
-	s.JujuConnSuite.SetUpSuite(c)
-}
-
-func (s *BundlesDirSuite) TearDownSuite(c *gc.C) {
-	s.JujuConnSuite.TearDownSuite(c)
-	s.HTTPSuite.TearDownSuite(c)
-}
-
-func (s *BundlesDirSuite) SetUpTest(c *gc.C) {
-	s.HTTPSuite.SetUpTest(c)
-	s.JujuConnSuite.SetUpTest(c)
-
-	// Add a charm, service and unit to login to the API with.
-	charm := s.AddTestingCharm(c, "wordpress")
-	service, err := s.State.AddService("wordpress", charm)
-	c.Assert(err, gc.IsNil)
-	unit, err := service.AddUnit()
-	c.Assert(err, gc.IsNil)
-	err = unit.SetPassword("password")
-	c.Assert(err, gc.IsNil)
-
-	s.st = s.OpenAPIAs(c, unit.Tag(), "password")
-	c.Assert(s.st, gc.NotNil)
-	s.uniter = s.st.Uniter()
-	c.Assert(s.uniter, gc.NotNil)
-}
-
-func (s *BundlesDirSuite) TearDownTest(c *gc.C) {
-	err := s.st.Close()
-	c.Assert(err, gc.IsNil)
-	s.JujuConnSuite.TearDownTest(c)
-	s.HTTPSuite.TearDownTest(c)
-}
-
-func (s *BundlesDirSuite) AddCharm(c *gc.C) (*uniter.Charm, *state.Charm, []byte) {
-	curl := corecharm.MustParseURL("cs:series/dummy-1")
-	surl, err := url.Parse(s.URL("/some/charm.bundle"))
-	c.Assert(err, gc.IsNil)
-	bunpath := coretesting.Charms.BundlePath(c.MkDir(), "dummy")
-	bun, err := corecharm.ReadBundle(bunpath)
-	c.Assert(err, gc.IsNil)
-	bundata, hash := readHash(c, bunpath)
-	sch, err := s.State.AddCharm(bun, curl, surl, hash)
-	c.Assert(err, gc.IsNil)
-	apiCharm, err := s.uniter.Charm(sch.URL())
-	c.Assert(err, gc.IsNil)
-	return apiCharm, sch, bundata
-}
-
-func (s *BundlesDirSuite) TestGet(c *gc.C) {
-	basedir := c.MkDir()
-	bunsdir := filepath.Join(basedir, "random", "bundles")
-	d := charm.NewBundlesDir(bunsdir)
-
-	// Check it doesn't get created until it's needed.
-	_, err := os.Stat(bunsdir)
-	c.Assert(err, checkers.Satisfies, os.IsNotExist)
-
-	// Add a charm to state that we can try to get.
-	apiCharm, sch, bundata := s.AddCharm(c)
-
-	// Try to get the charm when the content doesn't match.
-	coretesting.Server.Response(200, nil, []byte("roflcopter"))
-	_, err = d.Read(apiCharm, nil)
-	prefix := fmt.Sprintf(`failed to download charm "cs:series/dummy-1" from %q: `, sch.BundleURL())
-	c.Assert(err, gc.ErrorMatches, prefix+fmt.Sprintf(`expected sha256 %q, got ".*"`, sch.BundleSha256()))
-
-	// Try to get a charm whose bundle doesn't exist.
-	coretesting.Server.Response(404, nil, nil)
-	_, err = d.Read(apiCharm, nil)
-	c.Assert(err, gc.ErrorMatches, prefix+`.* 404 Not Found`)
-
-	// Get a charm whose bundle exists and whose content matches.
-	coretesting.Server.Response(200, nil, bundata)
-	ch, err := d.Read(apiCharm, nil)
-	c.Assert(err, gc.IsNil)
-	assertCharm(c, ch, sch)
-
-	// Get the same charm again, without preparing a response from the server.
-	ch, err = d.Read(apiCharm, nil)
-	c.Assert(err, gc.IsNil)
-	assertCharm(c, ch, sch)
-
-	// Abort a download.
-	err = os.RemoveAll(bunsdir)
-	c.Assert(err, gc.IsNil)
-	abort := make(chan struct{})
-	done := make(chan bool)
-	go func() {
-		ch, err := d.Read(apiCharm, abort)
-		c.Assert(ch, gc.IsNil)
-		c.Assert(err, gc.ErrorMatches, prefix+"aborted")
-		close(done)
-	}()
-	close(abort)
-	coretesting.Server.Response(500, nil, nil)
-	select {
-	case <-done:
-	case <-time.After(coretesting.LongWait):
-		c.Fatalf("timed out waiting for abort")
-	}
-}
-
-func readHash(c *gc.C, path string) ([]byte, string) {
-	data, err := ioutil.ReadFile(path)
-	c.Assert(err, gc.IsNil)
-	hash := sha256.New()
-	hash.Write(data)
-	return data, hex.EncodeToString(hash.Sum(nil))
-}
-
-func assertCharm(c *gc.C, bun *corecharm.Bundle, sch *state.Charm) {
-	c.Assert(bun.Revision(), gc.Equals, sch.Revision())
-	c.Assert(bun.Meta(), gc.DeepEquals, sch.Meta())
-	c.Assert(bun.Config(), gc.DeepEquals, sch.Config())
-}