Commit 1ec46634 authored by Łukasz Nowak's avatar Łukasz Nowak

- revert 41068

Test shall be simple, without advanced detection in test itself.

If there is a need to test different things in different environment it
shall be configured before running test to have stable assertions.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41188 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6f150041
...@@ -1124,9 +1124,9 @@ class AssertCyrusSasl(AssertSoftwareMixin): ...@@ -1124,9 +1124,9 @@ class AssertCyrusSasl(AssertSoftwareMixin):
]) ])
class AssertPython26(AssertSoftwareMixin): class AssertPython26(AssertSoftwareMixin):
# .1 could be read from current buildout
parts_name = 'rebootstrap.1.parts' parts_name = 'rebootstrap.1.parts'
python_path = parts_name + '/python%s' % getPythonVersion() python_path = parts_name + '/python2.6'
python_dynload_folder = python_path + '/lib/python%s/lib-dynload' % getPythonVersion()
rpath_list = [ rpath_list = [
'bzip2', 'bzip2',
'gdbm', 'gdbm',
...@@ -1139,39 +1139,39 @@ class AssertPython26(AssertSoftwareMixin): ...@@ -1139,39 +1139,39 @@ class AssertPython26(AssertSoftwareMixin):
'zlib', 'zlib',
] ]
def test_ld_dyn_bsddb(self): def test_ld_dyn_bsddb(self):
self.assertLibraryList(self.python_dynload_folder+'/_bsddb.so', [ self.assertLibraryList(self.python_path+'/lib/python2.6/lib-dynload/_bsddb.so', [
'libc', 'libc',
'libdb-4.5', 'libdb-4.5',
'libpthread', 'libpthread',
], self.rpath_list) ], self.rpath_list)
def test_ld_dyn_dbm(self): def test_ld_dyn_dbm(self):
self.assertLibraryList(self.python_dynload_folder+'/dbm.so', [ self.assertLibraryList(self.python_path+'/lib/python2.6/lib-dynload/dbm.so', [
'libc', 'libc',
'libgdbm', 'libgdbm',
'libgdbm_compat', 'libgdbm_compat',
'libpthread', 'libpthread',
], self.rpath_list) ], self.rpath_list)
def test_ld_dyn_locale(self): def test_ld_dyn_locale(self):
self.assertLibraryList(self.python_dynload_folder+'/_locale.so', [ self.assertLibraryList(self.python_path+'/lib/python2.6/lib-dynload/_locale.so', [
'libc', 'libc',
'libintl', 'libintl',
'libpthread', 'libpthread',
], self.rpath_list) ], self.rpath_list)
def test_ld_dyn_readline(self): def test_ld_dyn_readline(self):
self.assertLibraryList(self.python_dynload_folder+'/readline.so', [ self.assertLibraryList(self.python_path+'/lib/python2.6/lib-dynload/readline.so', [
'libc', 'libc',
'libncursesw', 'libncursesw',
'libreadline', 'libreadline',
'libpthread', 'libpthread',
], self.rpath_list) ], self.rpath_list)
def test_ld_dyn_sqlite3(self): def test_ld_dyn_sqlite3(self):
self.assertLibraryList(self.python_dynload_folder+'/_sqlite3.so', [ self.assertLibraryList(self.python_path+'/lib/python2.6/lib-dynload/_sqlite3.so', [
'libc', 'libc',
'libsqlite3', 'libsqlite3',
'libpthread', 'libpthread',
], self.rpath_list) ], self.rpath_list)
def test_ld_dyn_ssl(self): def test_ld_dyn_ssl(self):
self.assertLibraryList(self.python_dynload_folder+'/_ssl.so', [ self.assertLibraryList(self.python_path+'/lib/python2.6/lib-dynload/_ssl.so', [
'libc', 'libc',
'libssl', 'libssl',
'libcrypto', 'libcrypto',
...@@ -1179,7 +1179,7 @@ class AssertPython26(AssertSoftwareMixin): ...@@ -1179,7 +1179,7 @@ class AssertPython26(AssertSoftwareMixin):
], self.rpath_list) ], self.rpath_list)
def test_no_failed_ext_lib(self): def test_no_failed_ext_lib(self):
self.assertEquals([], self.assertEquals([],
glob(self.python_dynload_folder+'/*_failed.so')) glob(self.python_path+'/lib/python2.6/lib-dynload/*_failed.so'))
class AssertGettext(AssertSoftwareMixin): class AssertGettext(AssertSoftwareMixin):
def test_ld_libintl(self): def test_ld_libintl(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment