diff --git a/testing/__init__.py b/testing/__init__.py deleted file mode 100644 index 792d60054..000000000 --- a/testing/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/testing/path/svntestbase.py b/testing/path/svntestbase.py index e28bb994a..8d94a9ca6 100644 --- a/testing/path/svntestbase.py +++ b/testing/path/svntestbase.py @@ -1,7 +1,7 @@ import sys import py from py._path import svnwc as svncommon -from testing.path.common import CommonFSTests +from common import CommonFSTests class CommonSvnTests(CommonFSTests): diff --git a/testing/path/test_local.py b/testing/path/test_local.py index 8aeb36ff3..15751281a 100644 --- a/testing/path/test_local.py +++ b/testing/path/test_local.py @@ -1,7 +1,7 @@ import py import sys from py.path import local -from testing.path import common +import common failsonjython = py.test.mark.xfail("sys.platform.startswith('java')") failsonjywin32 = py.test.mark.xfail("sys.platform.startswith('java') " diff --git a/testing/path/test_svnauth.py b/testing/path/test_svnauth.py index 15914551d..27a53c746 100644 --- a/testing/path/test_svnauth.py +++ b/testing/path/test_svnauth.py @@ -1,5 +1,5 @@ import py -from testing.path import svntestbase +import svntestbase from py.path import SvnAuth import time import sys diff --git a/testing/path/test_svnurl.py b/testing/path/test_svnurl.py index e6e226661..e3a3e96ab 100644 --- a/testing/path/test_svnurl.py +++ b/testing/path/test_svnurl.py @@ -2,7 +2,7 @@ import py from py._path.svnurl import InfoSvnCommand import datetime import time -from testing.path.svntestbase import CommonSvnTests +from svntestbase import CommonSvnTests def pytest_funcarg__path1(request): repo, repourl, wc = request.getfuncargvalue("repowc1") diff --git a/testing/path/test_svnwc.py b/testing/path/test_svnwc.py index 7b8c97666..82ff8f4c4 100644 --- a/testing/path/test_svnwc.py +++ b/testing/path/test_svnwc.py @@ -2,7 +2,7 @@ import py import os, sys from py._path.svnwc import InfoSvnWCCommand, XMLWCStatus, parse_wcinfotime from py._path import svnwc as svncommon -from testing.path.svntestbase import CommonSvnTests +from svntestbase import CommonSvnTests def test_make_repo(path1, tmpdir): repo = tmpdir.join("repo")