mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-04 11:57:28 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
78 lines
2.2 KiB
Diff
78 lines
2.2 KiB
Diff
diff --git a/tests/test_watcher.py b/tests/test_watcher.py
|
|
index fa0ae41..5310bdc 100644
|
|
--- a/tests/test_watcher.py
|
|
+++ b/tests/test_watcher.py
|
|
@@ -3,18 +3,22 @@
|
|
import os
|
|
import time
|
|
import shutil
|
|
+import unittest
|
|
from livereload.watcher import Watcher
|
|
|
|
tmpdir = os.path.join(os.path.dirname(__file__), 'tmp')
|
|
|
|
|
|
-class TestWatcher(object):
|
|
+class TestWatcher(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
if os.path.isdir(tmpdir):
|
|
shutil.rmtree(tmpdir)
|
|
os.mkdir(tmpdir)
|
|
|
|
+ def tearDown(self):
|
|
+ shutil.rmtree(tmpdir)
|
|
+
|
|
def test_watch_dir(self):
|
|
os.mkdir(os.path.join(tmpdir, '.git'))
|
|
os.mkdir(os.path.join(tmpdir, '.hg'))
|
|
@@ -25,6 +29,9 @@ class TestWatcher(object):
|
|
watcher.watch(tmpdir)
|
|
assert watcher.is_changed(tmpdir) is False
|
|
|
|
+ # sleep 1 second so that mtime will be different
|
|
+ time.sleep(1)
|
|
+
|
|
with open(os.path.join(tmpdir, 'foo'), 'w') as f:
|
|
f.write('')
|
|
|
|
@@ -35,6 +42,9 @@ class TestWatcher(object):
|
|
watcher = Watcher()
|
|
watcher.count = 0
|
|
|
|
+ # sleep 1 second so that mtime will be different
|
|
+ time.sleep(1)
|
|
+
|
|
filepath = os.path.join(tmpdir, 'foo')
|
|
with open(filepath, 'w') as f:
|
|
f.write('')
|
|
@@ -51,22 +61,24 @@ class TestWatcher(object):
|
|
with open(filepath, 'w') as f:
|
|
f.write('')
|
|
|
|
- assert watcher.examine() == os.path.abspath(filepath)
|
|
+ rv = watcher.examine()
|
|
+ assert rv[0] == os.path.abspath(filepath)
|
|
assert watcher.count == 1
|
|
|
|
def test_watch_glob(self):
|
|
watcher = Watcher()
|
|
watcher.watch(tmpdir + '/*')
|
|
- assert watcher.examine() is None
|
|
+ assert watcher.examine() == (None, None)
|
|
|
|
with open(os.path.join(tmpdir, 'foo.pyc'), 'w') as f:
|
|
f.write('')
|
|
|
|
- assert watcher.examine() is None
|
|
+ assert watcher.examine() == (None, None)
|
|
|
|
filepath = os.path.join(tmpdir, 'foo')
|
|
|
|
with open(filepath, 'w') as f:
|
|
f.write('')
|
|
|
|
- assert watcher.examine() == os.path.abspath(filepath)
|
|
+ rv = watcher.examine()
|
|
+ assert rv[0] == os.path.abspath(filepath)
|