summaryrefslogtreecommitdiff
path: root/git/test/test_index.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-06-07 21:36:42 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-06-07 21:36:42 +0200
commit58a930a632c867b65b9a3802e2f4190cf32e33ee (patch)
tree95b1311a3a4bfcdf4c2dba66f360e6985184013e /git/test/test_index.py
parenta98e0af511b728030c12bf8633b077866bb74e47 (diff)
parentf6897c78be5a5530129df50742cb6cabfb8609c9 (diff)
downloadgitpython-58a930a632c867b65b9a3802e2f4190cf32e33ee.tar.gz
Merge branch 'gitdbmerger'
Diffstat (limited to 'git/test/test_index.py')
-rw-r--r--git/test/test_index.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/git/test/test_index.py b/git/test/test_index.py
index 5d227897..7d65cb9b 100644
--- a/git/test/test_index.py
+++ b/git/test/test_index.py
@@ -4,7 +4,12 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from git.test.lib import *
+from git.test.lib import (
+ TestBase,
+ with_rw_repo,
+ fixture_path,
+ fixture
+ )
from git import *
import inspect
import os
@@ -12,6 +17,7 @@ import sys
import tempfile
import glob
import shutil
+import time
from stat import *
class TestIndex(TestBase):