fix unit tests

Signed-off-by: Waldemar Kozaczuk <[email protected]>

cmd/package.go

@@ -202,7 +202,7 @@ func ComposePackage(repo *util.Repo, extraDependencies []string, imageSize int64
 		if !updatePackage || !imageExists {
 			zfsBuilderPath, err = repo.GetZfsBuilderImagePath()
 			if err != nil {
-				return fmt.Errorf("Failed to find ZFS builder path.\nError was: %s", appName, err)
+				return fmt.Errorf("Failed to find ZFS builder path.\nError was: %s", err)
 			}
 			// Initialize an empty image based on the provided loader image. imageSize is used to
 			// determine the size of the user partition. Use default loader image.

cmd/package_test.go

@@ -218,7 +218,7 @@ func (*suite) TestComposeWithNoManifestSucceeds(c *C) {
 	imageSize, _ := util.ParseMemSize("64M")
 	appName := "test-corrupt-app"
 
-	err := ComposePackage(repo, []string{}, imageSize, false, false, true, tmp, appName, &BootOptions{}, "rofs", "")
+	err := ComposePackage(repo, []string{}, imageSize, false, false, true, tmp, appName, &BootOptions{}, "rofs", "osv-loader")
 
 	c.Assert(err, IsNil)
 }
@@ -239,7 +239,7 @@ func (*suite) TestComposeCorruptPackageFails(c *C) {
 	imageSize, _ := util.ParseMemSize("64M")
 	appName := "test-corrupt-app"
 
-	err = ComposePackage(repo, []string{}, imageSize, false, false, false, tmp, appName, &BootOptions{}, "zfs", "")
+	err = ComposePackage(repo, []string{}, imageSize, false, false, false, tmp, appName, &BootOptions{}, "zfs", "osv-loader")
 	c.Assert(err, NotNil)
 }
 

util/github_releases_repository_test.go

@@ -37,8 +37,8 @@ func (s *suite) TestGithubPackageInfoRemote(c *C) {
 }
 
 func (s *suite) TestGithubDownloadLoaderImage(c *C) {
-	s.repo.ReleaseTag = "v0.51.0"
-	loaderName, err := s.repo.DownloadLoaderImage("qemu")
+	s.repo.ReleaseTag = "v0.57.0"
+	loaderName, err := s.repo.DownloadLoaderImage("osv-loader", "qemu")
 	c.Assert(err, IsNil)
 	c.Check(loaderName, Equals, "osv-loader")
 }

util/testdata/github/cloudius-systems/osv/releases/download/v0.57.0/osv-loader.qemu.x86_64/payload

@@ -0,0 +1,7 @@
+name: osv.httpserver-html5-gui
+title: OSv HTML5 GUI (frontend)
+author: Waldek Kozaczuk
+version: 0.53.0
+require:
+- osv.httpserver-api
+created: 2019-03-26T11:47:43Z

util/testdata/github/cloudius-systems/osv/releases/download/v0.57.0/osv.bootstrap.yaml/payload

@@ -0,0 +1,6 @@
+name: osv.bootstrap
+title: OSv Bootstrap
+author: Anonymous
+version: 0.54.0
+created: "2019-09-16T07:52:38-04:00"
+platform: Ubuntu 19.04