[py-svn] py-trunk commit 59664dde5c23: don't depend on (and don't actually use anymore) testing/__init__.py
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Sat Jun 5 16:06:30 CEST 2010
# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview
# User holger krekel <holger at merlinux.eu>
# Date 1275604798 -7200
# Node ID 59664dde5c237442f5464e8830ad63b2b3fde5a0
# Parent 3d1972d3dc8691a2bc03de96e501678a321c0665
don't depend on (and don't actually use anymore) testing/__init__.py
--- 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
--- 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")
--- 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') "
--- 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")
--- a/testing/__init__.py
+++ /dev/null
@@ -1,1 +0,0 @@
-#
--- 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):
More information about the pytest-commit
mailing list