diff --git a/lib/config/folderconfiguration.go b/lib/config/folderconfiguration.go index b59f4e5c4..50ec9190b 100644 --- a/lib/config/folderconfiguration.go +++ b/lib/config/folderconfiguration.go @@ -23,7 +23,7 @@ import ( var ( ErrPathNotDirectory = errors.New("folder path not a directory") ErrPathMissing = errors.New("folder path missing") - ErrMarkerMissing = errors.New("folder marker missing") + ErrMarkerMissing = errors.New("folder marker missing (this indicates potential data loss, search docs/forum to get information about how to proceed)") ) const DefaultMarkerName = ".stfolder" diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 68cc7d5cd..2a0da0b71 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -1610,7 +1610,7 @@ func TestROScanRecovery(t *testing.T) { testOs.Mkdir(fcfg.Path, 0700) - waitForState(t, sub, "default", "folder marker missing") + waitForState(t, sub, "default", config.ErrMarkerMissing.Error()) fd := testOs.Create(filepath.Join(fcfg.Path, config.DefaultMarkerName)) fd.Close() @@ -1619,7 +1619,7 @@ func TestROScanRecovery(t *testing.T) { testOs.Remove(filepath.Join(fcfg.Path, config.DefaultMarkerName)) - waitForState(t, sub, "default", "folder marker missing") + waitForState(t, sub, "default", config.ErrMarkerMissing.Error()) testOs.Remove(fcfg.Path) @@ -1663,7 +1663,7 @@ func TestRWScanRecovery(t *testing.T) { testOs.Mkdir(fcfg.Path, 0700) - waitForState(t, sub, "default", "folder marker missing") + waitForState(t, sub, "default", config.ErrMarkerMissing.Error()) fd := testOs.Create(filepath.Join(fcfg.Path, config.DefaultMarkerName)) fd.Close() @@ -1672,7 +1672,7 @@ func TestRWScanRecovery(t *testing.T) { testOs.Remove(filepath.Join(fcfg.Path, config.DefaultMarkerName)) - waitForState(t, sub, "default", "folder marker missing") + waitForState(t, sub, "default", config.ErrMarkerMissing.Error()) testOs.Remove(fcfg.Path)