Merge lp:~sergiusens/snappy/upload into lp:~snappy-dev/snappy/snappy-moved-to-github

[Sergio Schvezov]

Factor out update from cmd

[Michael Vogt (mvo)]

Yay! I like that a lot! Some nit-picking inline, but really good stuff.

[Sergio Schvezov (sergiusens)]

I did it

[Michael Vogt (mvo)]

Very impressive, thanks a bunch. We need the opposite of FIXME now so that we can re-use the fully mocked store to re-use it in other tests :-D

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~sergiusens/snappy/upload into lp:snappy failed. Below is the output from the failed tests.

Checking docs
Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update code.google.com/p/go.crypto failed; trying to fetch newer version
update github.com/blakesmith/ar failed; trying to fetch newer version
code.google.com/p/go.crypto now at 69e2a90ed92d03812364aeb947b7068dc42e561e
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 15347ef417a300349807983f15af9e65cd2e1b3a
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
Building
Running tests from /home/tarmac/tmp/tmp.5ftTLX4xMx/src/launchpad.net/snappy
=== RUN Test
OK: 16 passed
--- PASS: Test (0.32 seconds)
PASS
coverage: 74.8% of statements
ok launchpad.net/snappy/clickdeb 0.323s coverage: 74.8% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 12.2% of statements
ok launchpad.net/snappy/cmd/snappy 0.021s coverage: 12.2% of statements
=== RUN Test
OK: 24 passed
--- PASS: Test (0.10 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/coreconfig 0.101s coverage: 100.0% of statements
=== RUN Test
OK: 50 passed
--- PASS: Test (0.32 seconds)
PASS
coverage: 80.9% of statements
ok launchpad.net/snappy/helpers 0.323s coverage: 80.9% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 93.5% of statements
ok launchpad.net/snappy/logger 0.005s coverage: 93.5% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/oauth 0.006s coverage: 100.0% of statements
=== RUN Test
OK: 38 passed
--- PASS: Test (0.16 seconds)
PASS
coverage: 81.1% of statements
ok launchpad.net/snappy/partition 0.165s coverage: 81.1% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/pkg 0.003s coverage: 100.0% of statements
=== RUN Test
OK: 12 passed
--- PASS: Test (0.10 seconds)
PASS
coverage: 94.3% of statements
ok launchpad.net/snappy/policy 0.110s coverage: 94.3% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 84.8% of statements
ok launchpad.net/snappy/priv 0.005s coverage: 84.8% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 50.0% of statements
ok launchpad.net/snappy/progress 0.008s coverage: 50.0% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/provi...

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'cmd/snappy/cmd_update.go'
--- cmd/snappy/cmd_update.go	2015-05-19 14:09:19 +0000
+++ cmd/snappy/cmd_update.go	2015-06-10 15:13:33 +0000
@@ -66,21 +66,11 @@
 		flags = 0
 	}
 
-	updates, err := snappy.ListUpdates()
+	updates, err := snappy.Update(flags, progress.MakeProgressBar())
 	if err != nil {
 		return err
 	}
 
-	for _, part := range updates {
-		fmt.Printf("Installing %s (%s)\n", part.Name(), part.Version())
-		if _, err := part.Install(progress.MakeProgressBar(), flags); err != nil {
-			return err
-		}
-		if err := snappy.GarbageCollect(part.Name(), flags, progress.MakeProgressBar()); err != nil {
-			return err
-		}
-	}
-
 	if len(updates) > 0 {
 		showVerboseList(updates, os.Stdout)
 	}

=== modified file 'snappy/install.go'
--- snappy/install.go	2015-05-20 17:24:29 +0000
+++ snappy/install.go	2015-06-10 15:13:33 +0000
@@ -20,6 +20,7 @@
 package snappy
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"sort"
@@ -65,6 +66,29 @@
 	return false
 }
 
+// Update the installed snappy packages, it returns the updated Parts
+// if updates where available and an error and nil if any of the updates
+// fail to apply.
+func Update(flags InstallFlags, meter progress.Meter) ([]Part, error) {
+	updates, err := ListUpdates()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, part := range updates {
+		meter.Notify(fmt.Sprintf("Updating %s (%s)", part.Name(), part.Version()))
+
+		if _, err := part.Install(meter, flags); err != nil {
+			return nil, err
+		}
+		if err := GarbageCollect(part.Name(), flags, meter); err != nil {
+			return nil, err
+		}
+	}
+
+	return updates, nil
+}
+
 // Install the givens snap names provided via args. This can be local
 // files or snaps that are queried from the store
 func Install(name string, flags InstallFlags, meter progress.Meter) (string, error) {

=== modified file 'snappy/install_test.go'
--- snappy/install_test.go	2015-06-09 19:11:54 +0000
+++ snappy/install_test.go	2015-06-10 15:13:33 +0000
@@ -20,6 +20,7 @@
 package snappy
 
 import (
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -29,6 +30,7 @@
 	"path/filepath"
 
 	. "gopkg.in/check.v1"
+	"launchpad.net/snappy/partition"
 	"launchpad.net/snappy/progress"
 )
 
@@ -182,3 +184,89 @@
 	_, err = Install("hello-app.potato", 0, ag)
 	c.Assert(err, ErrorMatches, ".*"+ErrPackageNameAlreadyInstalled.Error())
 }
+
+func (s *SnapTestSuite) TestUpdate(c *C) {
+	snapPackagev1 := makeTestSnapPackage(c, "name: foo\nversion: 1\nvendor: foo")
+	name, err := Install(snapPackagev1, AllowUnauthenticated|DoInstallGC, &progress.NullProgress{})
+	c.Assert(err, IsNil)
+	c.Assert(name, Equals, "foo")
+
+	snapPackagev2 := makeTestSnapPackage(c, "name: foo\nversion: 2\nvendor: foo")
+
+	snapR, err := os.Open(snapPackagev2)
+	c.Assert(err, IsNil)
+	defer snapR.Close()
+
+	// details
+	var dlURL string
+	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/details/foo":
+			io.WriteString(w, `{
+"package_name": "foo",
+"version": "2",
+"origin": "sideload",
+"anon_download_url": "`+dlURL+`"
+}`)
+		case "/dl":
+			snapR.Seek(0, 0)
+			io.Copy(w, snapR)
+		default:
+			panic("unexpected url path: " + r.URL.Path)
+		}
+	}))
+	dlURL = mockServer.URL + "/dl"
+
+	storeDetailsURI, err = url.Parse(mockServer.URL + "/details/")
+	c.Assert(err, IsNil)
+
+	c.Assert(mockServer, NotNil)
+	defer mockServer.Close()
+
+	// bulk
+	mockServer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		io.WriteString(w, `[{
+	"package_name": "foo",
+	"version": "2",
+	"origin": "sideload",
+	"anon_download_url": "`+dlURL+`"
+}]`)
+	}))
+
+	storeBulkURI, err = url.Parse(mockServer.URL)
+	c.Assert(err, IsNil)
+
+	c.Assert(mockServer, NotNil)
+	defer mockServer.Close()
+
+	// system image
+	newPartition = func() (p partition.Interface) {
+		return new(MockPartition)
+	}
+	defer func() { newPartition = newPartitionImpl }()
+
+	tempdir := c.MkDir()
+	systemImageRoot = tempdir
+
+	makeFakeSystemImageChannelConfig(c, filepath.Join(tempdir, systemImageChannelConfig), "1")
+	// setup fake /other partition
+	makeFakeSystemImageChannelConfig(c, filepath.Join(tempdir, "other", systemImageChannelConfig), "2")
+
+	siServer := runMockSystemImageWebServer()
+	defer siServer.Close()
+
+	mockServer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		io.WriteString(w, fmt.Sprintf(mockSystemImageIndexJSONTemplate, "1"))
+	}))
+	c.Assert(mockServer, NotNil)
+	defer mockServer.Close()
+
+	systemImageServer = mockServer.URL
+
+	// the test
+	updates, err := Update(0, &progress.NullProgress{})
+	c.Assert(err, IsNil)
+	c.Assert(updates, HasLen, 1)
+	c.Check(updates[0].Name(), Equals, "foo")
+	c.Check(updates[0].Version(), Equals, "2")
+}

=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go	2015-06-09 20:36:07 +0000
+++ snappy/systemimage.go	2015-06-10 15:13:33 +0000
@@ -68,7 +68,9 @@
 var systemImageRoot = "/"
 
 // will replace newPartition() to return a mockPartition
-var newPartition = func() (p partition.Interface) {
+var newPartition = newPartitionImpl
+
+func newPartitionImpl() (p partition.Interface) {
 	return partition.New()
 }