floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix typos in converting test_oldmagic

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Benjamin Peterson
2009-08-29 14:54:15 -05:00
parent 8a6a3183ae
commit 9af223e6cb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
py/_testing/test_oldmagic.py
View File

@@ -100,12 +100,12 @@ class Testautopath:
d = {'__file__' : str(testpath)}
oldsyspath = sys.path[:]
try:
py.test.exec_(self.getauto, d)
py.builtin.exec_(self.getauto, d)
conf = d['autopath']
assert conf.dirpath() == self.initdir2
assert conf.pkgdir == self.initdir
assert str(self.root) in sys.path
py.test.exec_(self.getauto in d)
py.builtin.exec_(self.getauto, d)
assert conf is not d['autopath']
finally:
sys.path[:] = oldsyspath
@@ -116,12 +116,12 @@ class Testautopath:
d = {'__file__' : str(testpath)}
oldsyspath = sys.path[:]
try:
py.test.exec_(self.getauto, d)
py.builtin.exec_(self.getauto, d)
conf = d['autopath']
assert conf == self.initdir2.join('autoconfiguretest.py')
assert conf.pkgdir == self.initdir
assert str(self.root) in sys.path
py.test.exec_(self.getauto, d)
py.builtin.exec_(self.getauto, d)
assert conf is not d['autopath']
finally:
sys.path[:] = oldsyspath
@@ -131,13 +131,13 @@ class Testautopath:
d = {'__file__' : str(testpath)}
oldsyspath = sys.path[:]
try:
py.test.exec_(self.getauto, d)
py.builtin.exec_(self.getauto, d)
conf = d['autopath']
assert conf.dirpath() == self.root
assert conf.pkgdir == self.root
syspath = sys.path[:]
assert str(self.root) in syspath
py.test.exec_(self.getauto, d)
py.builtin.exec_(self.getauto, d)
assert conf is not d['autopath']
finally:
sys.path[:] = oldsyspath
@@ -149,7 +149,7 @@ class Testautopath:
oldsyspath = sys.path[:]
try:
d = {}
py.test.exec_(self.getauto, d)
py.builtin.exec_(self.getauto, d)
conf = d['autopath']
assert conf.dirpath() == self.initdir2
assert conf.pkgdir == self.initdir
@@ -167,7 +167,7 @@ class Testautopath:
try:
py.test.raises(ValueError,'''
d = {}
py.test.exec_(self.getauto, d)
py.builtin.exec_(self.getauto, d)
''')
finally:
sys.path[:] = oldsyspath