Merge lp:~mvo/snappy/snappy-lp1468831-race into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Tiny branch that avoids race in tests

[Michael Vogt (mvo)]

Thinking about this, running the entire testsuite with faketime might also be a alternative. Not sure if its a better one though.

[Leo Arias (elopio)]

A little late, but yes, if we can fake the sleeps and times for unit tests, that will make things faster and we will be able to test more complex things.

Thanks mvo.

Unmerged revisions

641. By Michael Vogt on 2015-08-26

helpers/helpers_test.go: avoid race in fs-compare code by waiting a tiny bit if the time is too close to a minute change

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-08-21 12:14:16 +0000
+++ helpers/helpers_test.go	2015-08-26 06:48:12 +0000
@@ -28,6 +28,7 @@
 	"os/exec"
 	"path/filepath"
 	"testing"
+	"time"
 
 	. "gopkg.in/check.v1"
 )
@@ -383,6 +384,14 @@
 
 func (ts *HTestSuite) TestSyncDirs(c *C) {
 
+	// ensure the test does not run too close before the time wraps
+	// to avoid time-stamp minute mismatches, see LP: #1468831
+	now := time.Now()
+	if now.Second() > 55 {
+		wait := 61 - now.Second()
+		time.Sleep(time.Duration(wait) * time.Second)
+	}
+
 	for _, l := range [][2]string{
 		[2]string{"src-short", "dst-loooooooooooong"},
 		[2]string{"src-loooooooooooong", "dst-short"},