use "snap-path" in the form value for try mode (thanks Gustavo)

canonical · May 27, 2016 · 6dd6ade · 6dd6ade
1 parent 67d3968
commit 6dd6ade
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/client/snap_op.go b/client/snap_op.go
@@ -107,7 +107,7 @@ func (client *Client) Try(path string, options *SnapOptions) (changeID string, e
 	buf := bytes.NewBuffer(nil)
 	mw := multipart.NewWriter(buf)
 	mw.WriteField("action", "try")
-	mw.WriteField("try", path)
+	mw.WriteField("snap-path", path)
 	mw.WriteField("devmode", strconv.FormatBool(options.DevMode))
 	mw.Close()
 

diff --git a/client/snap_op_test.go b/client/snap_op_test.go
@@ -181,9 +181,9 @@ func (cs *clientSuite) TestClientOpTryMode(c *check.C) {
 		mr := multipart.NewReader(cs.req.Body, params["boundary"])
 		formData := formToMap(c, mr)
 		c.Check(formData, check.DeepEquals, map[string]string{
-			"action":  "try",
-			"try":     snapdir,
-			"devmode": strconv.FormatBool(opts.DevMode),
+			"action":    "try",
+			"snap-path": snapdir,
+			"devmode":   strconv.FormatBool(opts.DevMode),
 		})
 
 		c.Check(cs.req.Method, check.Equals, "POST")

diff --git a/cmd/snap/cmd_snap_op_test.go b/cmd/snap/cmd_snap_op_test.go
@@ -182,7 +182,7 @@ func (s *SnapOpSuite) runTryTest(c *check.C, devmode bool) {
 		postData, err := ioutil.ReadAll(r.Body)
 		c.Assert(err, check.IsNil)
 		c.Assert(string(postData), check.Matches, "(?s).*Content-Disposition: form-data; name=\"action\"\r\n\r\ntry\r\n.*")
-		c.Assert(string(postData), check.Matches, fmt.Sprintf("(?s).*Content-Disposition: form-data; name=\"try\"\r\n\r\n%s\r\n.*", tryDir))
+		c.Assert(string(postData), check.Matches, fmt.Sprintf("(?s).*Content-Disposition: form-data; name=\"snap-path\"\r\n\r\n%s\r\n.*", tryDir))
 		c.Assert(string(postData), check.Matches, fmt.Sprintf("(?s).*Content-Disposition: form-data; name=\"devmode\"\r\n\r\n%s\r\n.*", strconv.FormatBool(devmode)))
 	}
 

diff --git a/daemon/api.go b/daemon/api.go
@@ -734,10 +734,10 @@ func sideloadSnap(c *Command, r *http.Request, user *auth.UserState) Response {
 	}
 
 	if len(form.Value["action"]) > 0 && form.Value["action"][0] == "try" {
-		if len(form.Value["try"]) == 0 {
-			return BadRequest("need 'try' value in form")
+		if len(form.Value["snap-path"]) == 0 {
+			return BadRequest("need 'snap-path' value in form")
 		}
-		return trySnap(c, r, user, form.Value["try"][0], flags)
+		return trySnap(c, r, user, form.Value["snap-path"][0], flags)
 	}
 
 	// find the file for the "snap" form field