snap: rename refresh-mode: survive to keep

canonical · Feb 8, 2018 · dbc944a · dbc944a
1 parent 7b774c6
commit dbc944a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/snap/validate.go b/snap/validate.go
@@ -422,7 +422,7 @@ func ValidateApp(app *AppInfo) error {
 
 	// validate refresh-mode
 	switch app.RefreshMode {
-	case "", "restart", "survive":
+	case "", "keep", "restart":
 		// valid
 	default:
 		return fmt.Errorf(`"refresh-mode" field contains invalid value %q`, app.RefreshMode)

diff --git a/snap/validate_test.go b/snap/validate_test.go
@@ -365,8 +365,8 @@ func (s *ValidateSuite) TestAppRefreshMode(c *C) {
 	}{
 		// good
 		{"", true},
+		{"keep", true},
 		{"restart", true},
-		{"survive", true},
 		// bad
 		{"invalid-thing", false},
 	} {
@@ -378,7 +378,7 @@ func (s *ValidateSuite) TestAppRefreshMode(c *C) {
 	}
 
 	// non-services cannot have a refresh-mode
-	err := ValidateApp(&AppInfo{Name: "foo", Daemon: "", RefreshMode: "survive"})
+	err := ValidateApp(&AppInfo{Name: "foo", Daemon: "", RefreshMode: "keep"})
 	c.Check(err, ErrorMatches, `"refresh-mode" cannot be used for "foo", only for services`)
 }
 

diff --git a/tests/lib/snaps/test-snapd-service/meta/snap.yaml b/tests/lib/snaps/test-snapd-service/meta/snap.yaml
@@ -13,4 +13,4 @@ apps:
         command: bin/start-survive
         stop-command: bin/stop-survive
         daemon: simple
-        refresh-mode: survive
+        refresh-mode: keep
diff --git a/wrappers/services.go b/wrappers/services.go
@@ -224,8 +224,8 @@ func StopServices(apps []*snap.AppInfo, reason snap.ServiceStopReason, inter int
 		if !app.IsService() || !osutil.FileExists(app.ServiceFile()) {
 			continue
 		}
-		// Skip stop on refresh when refresh mode is "survive"
-		if app.RefreshMode == "survive" && reason == snap.StopReasonRefresh {
+		// Skip stop on refresh when refresh mode is "keep"
+		if app.RefreshMode == "keep" && reason == snap.StopReasonRefresh {
 			continue
 		}
 		if err := stopService(sysd, app, inter); err != nil {

diff --git a/wrappers/services_test.go b/wrappers/services_test.go
@@ -622,7 +622,7 @@ version: 1.0
 apps:
  survivor:
   command: bin/survivor
-  refresh-mode: survive
+  refresh-mode: keep
   daemon: simple
 `
 	info := snaptest.MockSnap(c, surviveYaml, &snap.SideInfo{Revision: snap.R(1)})