[Erp5-report] r40076 luke - /erp5/trunk/buildout/tests/assertSoftware.py

[nobody at svn.erp5.org]

Author: luke
Date: Tue Nov  9 09:39:31 2010
New Revision: 40076

URL: http://svn.erp5.org?rev=40076&view=rev
Log:
 - create separate test case for mysql 5.0 tritonn

Modified:
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40076&r1=40075&r2=40076&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Tue Nov  9 09:39:31 2010
@@ -98,23 +98,6 @@ class AssertLddLibs(unittest.TestCase):
         "'parts/.*/lib/libiulib.so'")
     self.assertEqual(result, 0)
 
-  def test_tritonn_senna(self):
-    """Senna as an library"""
-    result = os.system("ldd parts/mysql-tritonn-5.0/libexec/mysqld | grep -q "
-        "'parts/senna/lib/libsenna.so.0'")
-    self.assertEqual(result, 0)
-
-  def test_MySQLdb(self):
-    """Checks proper linking to mysql library from MySQLdb egg"""
-    error_list = []
-    for d in os.listdir('develop-eggs'):
-      if d.startswith('MySQL_python'):
-        path = os.path.join('develop-eggs', d, '_mysql.so')
-        if os.system("ldd %s | grep -q 'parts/mysql-tritonn-5.0/lib/my"
-            "sql/libmysqlclient_r.so'" % path) != 0:
-          error_list.append(path)
-    self.assertEqual(error_list, [])
-
   def test_memcached_libevent(self):
     """Checks proper liunking to libevent from memcached"""
     result = os.system("ldd parts/memcached/bin/memcached | grep -q 'parts/li"
@@ -182,6 +165,24 @@ class AssertSoftwareRunable(unittest.Tes
     self.assertEqual(stderr, '')
     self.assertTrue(stdout.startswith('w3m version w3m/0.5.2'))
 
+  def test_MySQLdb(self):
+    """Checks proper linking to mysql library from MySQLdb egg"""
+    error_list = []
+    for d in os.listdir('develop-eggs'):
+      if d.startswith('MySQL_python'):
+        path = os.path.join('develop-eggs', d, '_mysql.so')
+        if os.system("ldd %s | grep -q 'parts/mysql-tritonn-5.0/lib/my"
+            "sql/libmysqlclient_r.so'" % path) != 0:
+          error_list.append(path)
+    self.assertEqual(error_list, [])
+
+class AssertMysql50Tritonn(unittest.TestCase):
+  def test_tritonn_senna(self):
+    """Senna as an library"""
+    result = os.system("ldd parts/mysql-tritonn-5.0/libexec/mysqld | grep -q "
+        "'parts/senna/lib/libsenna.so.0'")
+    self.assertEqual(result, 0)
+
 class AssertApache(unittest.TestCase):
   """Tests for built apache"""