Merge lp:~sergiusens/snapweb/sortResults into lp:~snappy-dev/snapweb/trunk

[Sergio Schvezov]

Return an ordered list of packages.

[John Lenton (chipaca)]

review: Approve

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-05 22:49:07 +0000
+++ snappy/converge.go	2015-05-06 12:51:43 +0000
@@ -18,6 +18,7 @@
 package snappy
 
 import (
+	"sort"
 	"strconv"
 	"strings"
 
@@ -153,6 +154,8 @@
 		snapPkgs = append(snapPkgs, *v)
 	}
 
+	sort.Sort(snapPkgsByName(snapPkgs))
+
 	return snapPkgs
 }
 
 
=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2015-05-05 22:49:07 +0000
+++ snappy/converge_test.go	2015-05-06 12:51:43 +0000
@@ -21,7 +21,6 @@
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"sort"
 
 	. "gopkg.in/check.v1"
 	"launchpad.net/snappy/snappy"
@@ -134,7 +133,6 @@
 	}
 
 	snaps := mergeSnaps(installed, nil, true)
-	sort.Sort(snapPkgsByName(snaps))
 
 	c.Assert(snaps, HasLen, 3)
 	c.Assert(snaps[0].Name, Equals, "app1.canonical")
@@ -165,7 +163,6 @@
 
 	// Only installed
 	snaps := mergeSnaps(installed, remotes, true)
-	sort.Sort(snapPkgsByName(snaps))
 
 	c.Assert(snaps, HasLen, 3)
 	c.Check(snaps[0].Name, Equals, "app1.canonical")
@@ -188,7 +185,6 @@
 
 	// Installed and remotes
 	snaps = mergeSnaps(installed, remotes, false)
-	sort.Sort(snapPkgsByName(snaps))
 
 	c.Assert(snaps, HasLen, 4)
 	c.Check(snaps[0].Name, Equals, "app1.canonical")
@@ -233,7 +229,6 @@
 
 	// Installed and remotes
 	snaps := mergeSnaps(installed, remotes, false)
-	sort.Sort(snapPkgsByName(snaps))
 
 	c.Assert(snaps, HasLen, 5)
 	c.Check(snaps[0].Name, Equals, "app1.canonical")