lib/versioner: Refactor for testing, speed up test

Test now takes <1 second instead of 100 seconds

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2978
This commit is contained in:
Jakob Borg 2016-04-15 14:26:39 +00:00 committed by Audrius Butkevicius
parent 0155b6f841
commit fa1cfd94d0
2 changed files with 64 additions and 77 deletions

View File

@ -150,27 +150,33 @@ func (v Staggered) clean() {
func (v Staggered) expire(versions []string) {
l.Debugln("Versioner: Expiring versions", versions)
var prevAge int64
firstFile := true
for _, file := range versions {
fi, err := osutil.Lstat(file)
if err != nil {
for _, file := range v.toRemove(versions, time.Now()) {
if fi, err := osutil.Lstat(file); err != nil {
l.Warnln("versioner:", err)
continue
}
if fi.IsDir() {
} else if fi.IsDir() {
l.Infof("non-file %q is named like a file version", file)
continue
}
if err := osutil.Remove(file); err != nil {
l.Warnf("Versioner: can't remove %q: %v", file, err)
}
}
}
func (v Staggered) toRemove(versions []string, now time.Time) []string {
var prevAge int64
firstFile := true
var remove []string
for _, file := range versions {
loc, _ := time.LoadLocation("Local")
versionTime, err := time.ParseInLocation(TimeFormat, filenameTag(file), loc)
if err != nil {
l.Debugf("Versioner: file name %q is invalid: %v", file, err)
continue
}
age := int64(time.Since(versionTime).Seconds())
age := int64(now.Sub(versionTime).Seconds())
// If the file is older than the max age of the last interval, remove it
if lastIntv := v.interval[len(v.interval)-1]; lastIntv.end > 0 && age > lastIntv.end {
@ -199,15 +205,14 @@ func (v Staggered) expire(versions []string) {
if prevAge-age < usedInterval.step {
l.Debugln("too many files in step -> delete", file)
err = os.Remove(file)
if err != nil {
l.Warnf("Versioner: can't remove %q: %v", file, err)
}
remove = append(remove, file)
continue
}
prevAge = age
}
return remove
}
// Archive moves the named file away to a version archive. If this function

View File

@ -7,78 +7,60 @@
package versioner
import (
"io/ioutil"
"os"
"path/filepath"
"sort"
"strconv"
"testing"
"time"
"github.com/d4l3k/messagediff"
)
func TestStaggeredVersioningVersionCount(t *testing.T) {
if testing.Short() {
t.Skip("Test takes some time, skipping.")
/* Default settings:
{30, 3600}, // first hour -> 30 sec between versions
{3600, 86400}, // next day -> 1 h between versions
{86400, 592000}, // next 30 days -> 1 day between versions
{604800, maxAge}, // next year -> 1 week between versions
*/
loc, _ := time.LoadLocation("Local")
now, _ := time.ParseInLocation(TimeFormat, "20160415-140000", loc)
files := []string{
// 14:00:00 is "now"
"test~20160415-140000", // 0 seconds ago
"test~20160415-135959", // 1 second ago
"test~20160415-135958", // 2 seconds ago
"test~20160415-135900", // 1 minute ago
"test~20160415-135859", // 1 minute 1 second ago
"test~20160415-135830", // 1 minute 30 seconds ago
"test~20160415-135829", // 1 minute 31 seconds ago
"test~20160415-135700", // 3 minutes ago
"test~20160415-135630", // 3 minutes 30 seconds ago
"test~20160415-133000", // 30 minutes ago
"test~20160415-132900", // 31 minutes ago
"test~20160415-132500", // 35 minutes ago
"test~20160415-132000", // 40 minutes ago
"test~20160415-130000", // 60 minutes ago
"test~20160415-124000", // 80 minutes ago
"test~20160415-122000", // 100 minutes ago
"test~20160415-110000", // 120 minutes ago
}
sort.Strings(files)
dir, err := ioutil.TempDir("", "")
defer os.RemoveAll(dir)
if err != nil {
t.Error(err)
delete := []string{
"test~20160415-140000", // 0 seconds ago
"test~20160415-135959", // 1 second ago
"test~20160415-135900", // 1 minute ago
"test~20160415-135830", // 1 minute 30 second ago
"test~20160415-130000", // 60 minutes ago
"test~20160415-124000", // 80 minutes ago
}
sort.Strings(delete)
v := NewStaggered("", dir, map[string]string{"maxAge": "365"})
versionDir := filepath.Join(dir, ".stversions")
path := filepath.Join(dir, "test")
for i := 1; i <= 3; i++ {
f, err := os.Create(path)
if err != nil {
t.Error(err)
}
f.Close()
v.Archive(path)
d, err := os.Open(versionDir)
if err != nil {
t.Error(err)
}
n, err := d.Readdirnames(-1)
if err != nil {
t.Error(err)
}
if len(n) != 1 {
t.Error("Wrong count")
}
d.Close()
time.Sleep(time.Second)
v := NewStaggered("", "testdata", map[string]string{"maxAge": strconv.Itoa(365 * 86400)}).(Staggered)
rem := v.toRemove(files, now)
if diff, equal := messagediff.PrettyDiff(delete, rem); !equal {
t.Errorf("Incorrect deleted files; got %v, expected %v\n%v", rem, delete, diff)
}
os.RemoveAll(path)
for i := 1; i <= 3; i++ {
f, err := os.Create(path)
if err != nil {
t.Error(err)
}
f.Close()
v.Archive(path)
d, err := os.Open(versionDir)
if err != nil {
t.Error(err)
}
n, err := d.Readdirnames(-1)
if err != nil {
t.Error(err)
}
if len(n) != i {
t.Error("Wrong count")
}
d.Close()
time.Sleep(31 * time.Second)
}
os.RemoveAll(path)
}