don't depend on (and don't actually use anymore) testing/__init__.py
--HG-- branch : trunk
This commit is contained in:
parent
bdd1006e06
commit
c56f4f9444
|
@ -1 +0,0 @@
|
||||||
#
|
|
|
@ -1,7 +1,7 @@
|
||||||
import sys
|
import sys
|
||||||
import py
|
import py
|
||||||
from py._path import svnwc as svncommon
|
from py._path import svnwc as svncommon
|
||||||
from testing.path.common import CommonFSTests
|
from common import CommonFSTests
|
||||||
|
|
||||||
class CommonSvnTests(CommonFSTests):
|
class CommonSvnTests(CommonFSTests):
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import py
|
import py
|
||||||
import sys
|
import sys
|
||||||
from py.path import local
|
from py.path import local
|
||||||
from testing.path import common
|
import common
|
||||||
|
|
||||||
failsonjython = py.test.mark.xfail("sys.platform.startswith('java')")
|
failsonjython = py.test.mark.xfail("sys.platform.startswith('java')")
|
||||||
failsonjywin32 = py.test.mark.xfail("sys.platform.startswith('java') "
|
failsonjywin32 = py.test.mark.xfail("sys.platform.startswith('java') "
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import py
|
import py
|
||||||
from testing.path import svntestbase
|
import svntestbase
|
||||||
from py.path import SvnAuth
|
from py.path import SvnAuth
|
||||||
import time
|
import time
|
||||||
import sys
|
import sys
|
||||||
|
|
|
@ -2,7 +2,7 @@ import py
|
||||||
from py._path.svnurl import InfoSvnCommand
|
from py._path.svnurl import InfoSvnCommand
|
||||||
import datetime
|
import datetime
|
||||||
import time
|
import time
|
||||||
from testing.path.svntestbase import CommonSvnTests
|
from svntestbase import CommonSvnTests
|
||||||
|
|
||||||
def pytest_funcarg__path1(request):
|
def pytest_funcarg__path1(request):
|
||||||
repo, repourl, wc = request.getfuncargvalue("repowc1")
|
repo, repourl, wc = request.getfuncargvalue("repowc1")
|
||||||
|
|
|
@ -2,7 +2,7 @@ import py
|
||||||
import os, sys
|
import os, sys
|
||||||
from py._path.svnwc import InfoSvnWCCommand, XMLWCStatus, parse_wcinfotime
|
from py._path.svnwc import InfoSvnWCCommand, XMLWCStatus, parse_wcinfotime
|
||||||
from py._path import svnwc as svncommon
|
from py._path import svnwc as svncommon
|
||||||
from testing.path.svntestbase import CommonSvnTests
|
from svntestbase import CommonSvnTests
|
||||||
|
|
||||||
def test_make_repo(path1, tmpdir):
|
def test_make_repo(path1, tmpdir):
|
||||||
repo = tmpdir.join("repo")
|
repo = tmpdir.join("repo")
|
||||||
|
|
Loading…
Reference in New Issue