Commit 2013838b authored by Abiola Ibrahim's avatar Abiola Ibrahim

Git: mock time functions in tests.

parent 879558b9
......@@ -57,14 +57,14 @@ func TestIntervals(t *testing.T) {
check(t, err)
// wait for first background pull
time.Sleep(time.Millisecond * 100)
gittest.Sleep(time.Millisecond * 100)
// switch logger to test file
logFile := gittest.Open("file")
git.Logger = log.New(logFile, "", 0)
// sleep for the interval
time.Sleep(repo.Interval)
gittest.Sleep(repo.Interval)
// get log output
out, err := ioutil.ReadAll(logFile)
......
......@@ -68,7 +68,7 @@ func (r *Repo) Pull() error {
defer r.Unlock()
// prevent a pull if the last one was less than 5 seconds ago
if time.Since(r.lastPull) < 5*time.Second {
if gos.TimeSince(r.lastPull) < 5*time.Second {
return nil
}
......
......@@ -160,7 +160,7 @@ Command echo Hello successful.
before := r.repo.lastPull
time.Sleep(r.repo.Interval)
gittest.Sleep(r.repo.Interval)
err = r.repo.Pull()
after := r.repo.lastPull
......
......@@ -5,6 +5,7 @@ import (
"io/ioutil"
"os"
"os/exec"
"time"
)
// File is an abstraction for file (os.File).
......@@ -114,6 +115,33 @@ type OS interface {
// beginning with prefix, opens the file for reading and writing, and
// returns the resulting File.
TempFile(string, string) (File, error)
// Sleep pauses the current goroutine for at least the duration d. A
// negative or zero duration causes Sleep to return immediately.
Sleep(time.Duration)
// NewTicker returns a new Ticker containing a channel that will send the
// time with a period specified by the argument.
NewTicker(time.Duration) Ticker
// TimeSince returns the time elapsed since the argument.
TimeSince(time.Time) time.Duration
}
// Ticker is an abstraction for Ticker (time.Ticker)
type Ticker interface {
C() <-chan time.Time
Stop()
}
// GitTicker is the implementation of Ticker for git.
type GitTicker struct {
*time.Ticker
}
// C returns the channel on which the ticks are delivered.s
func (g *GitTicker) C() <-chan time.Time {
return g.Ticker.C
}
// GitOS is the implementation of OS for git.
......@@ -158,3 +186,18 @@ func (g GitOS) ReadDir(dirname string) ([]os.FileInfo, error) {
func (g GitOS) Command(name string, args ...string) Cmd {
return &gitCmd{exec.Command(name, args...)}
}
// Sleep calls time.Sleep.
func (g GitOS) Sleep(d time.Duration) {
time.Sleep(d)
}
// New Ticker calls time.NewTicker.
func (g GitOS) NewTicker(d time.Duration) Ticker {
return &GitTicker{time.NewTicker(d)}
}
// TimeSince calls time.Since
func (g GitOS) TimeSince(t time.Time) time.Duration {
return time.Since(t)
}
......@@ -19,6 +19,9 @@ var CmdOutput = "success"
// TempFileName is the name of any file returned by mocked gitos.OS's TempFile().
var TempFileName = "tempfile"
// TimeSpeed is how faster the mocked gitos.Ticker and gitos.Sleep should run.
var TimeSpeed = 5
// dirs mocks a fake git dir if filename is "gitdir".
var dirs = map[string][]os.FileInfo{
"gitdir": {
......@@ -31,6 +34,11 @@ func Open(name string) gitos.File {
return &fakeFile{name: name}
}
// Sleep calls fake time.Sleep
func Sleep(d time.Duration) {
FakeOS.Sleep(d)
}
// fakeFile is a mock gitos.File.
type fakeFile struct {
name string
......@@ -70,7 +78,7 @@ func (f *fakeFile) Write(b []byte) (int, error) {
return len(b), nil
}
// fakeCmd is a mock git.Cmd.
// fakeCmd is a mock gitos.Cmd.
type fakeCmd struct{}
func (f fakeCmd) Run() error {
......@@ -128,7 +136,16 @@ func (f fakeInfo) Sys() interface{} {
return nil
}
// fakeOS is a mock git.OS.
// fakeTicker is a mock gitos.Ticker
type fakeTicker struct {
*time.Ticker
}
func (f fakeTicker) C() <-chan time.Time {
return f.Ticker.C
}
// fakeOS is a mock gitos.OS.
type fakeOS struct{}
func (f fakeOS) Mkdir(name string, perm os.FileMode) error {
......@@ -165,3 +182,15 @@ func (f fakeOS) ReadDir(dirname string) ([]os.FileInfo, error) {
func (f fakeOS) Command(name string, args ...string) gitos.Cmd {
return fakeCmd{}
}
func (f fakeOS) Sleep(d time.Duration) {
time.Sleep(d / time.Duration(TimeSpeed))
}
func (f fakeOS) NewTicker(d time.Duration) gitos.Ticker {
return &fakeTicker{time.NewTicker(d / time.Duration(TimeSpeed))}
}
func (f fakeOS) TimeSince(t time.Time) time.Duration {
return time.Since(t) * time.Duration(TimeSpeed)
}
......@@ -2,15 +2,15 @@ package git
import (
"sync"
"time"
"github.com/mholt/caddy/middleware/git/gitos"
)
// repoService is the service that runs in background and periodically
// pull from the repository.
type repoService struct {
repo *Repo
ticker *time.Ticker // ticker to tick at intervals
running bool // whether service is running.
ticker gitos.Ticker // ticker to tick at intervals
halt chan struct{} // channel to notify service to halt and stop pulling.
}
......@@ -18,14 +18,13 @@ type repoService struct {
func Start(repo *Repo) {
service := &repoService{
repo,
time.NewTicker(repo.Interval),
true,
gos.NewTicker(repo.Interval),
make(chan struct{}),
}
go func(s *repoService) {
for {
select {
case <-s.ticker.C:
case <-s.ticker.C():
err := repo.Pull()
if err != nil {
logger().Println(err)
......
......@@ -34,7 +34,7 @@ func Test(t *testing.T) {
}
}
time.Sleep(time.Second * 5)
gos.Sleep(time.Second * 5)
Services.Stop(repos[0].URL, 1)
if len(Services.services) != 4 {
t.Errorf("Expected %v service(s), found %v", 4, len(Services.services))
......@@ -52,7 +52,7 @@ func Test(t *testing.T) {
t.Errorf("Expected %v service(s), found %v", 6, len(Services.services))
}
time.Sleep(time.Second * 5)
gos.Sleep(time.Second * 5)
Services.Stop(repo.URL, -1)
if len(Services.services) != 4 {
t.Errorf("Expected %v service(s), found %v", 4, len(Services.services))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment