List:Commits« Previous MessageNext Message »
From:Dyre Tjeldvoll Date:November 21 2012 12:51pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4110 to 4111)
View as plain text  
 4111 Dyre Tjeldvoll	2012-11-21
      Always use unittest2 since unittest appears not to be available in bundle-python even if that is v2.7

    modified:
      storage/ndb/mcc/tst/tst_main.py
 4110 Dyre Tjeldvoll	2012-11-19
      Include unittest2 in tst dir so that it is available in PBÃ

    added:
      storage/ndb/mcc/tst/unittest2/
      storage/ndb/mcc/tst/unittest2/__init__.py
      storage/ndb/mcc/tst/unittest2/__main__.py
      storage/ndb/mcc/tst/unittest2/case.py
      storage/ndb/mcc/tst/unittest2/collector.py
      storage/ndb/mcc/tst/unittest2/compatibility.py
      storage/ndb/mcc/tst/unittest2/loader.py
      storage/ndb/mcc/tst/unittest2/main.py
      storage/ndb/mcc/tst/unittest2/result.py
      storage/ndb/mcc/tst/unittest2/runner.py
      storage/ndb/mcc/tst/unittest2/signals.py
      storage/ndb/mcc/tst/unittest2/suite.py
      storage/ndb/mcc/tst/unittest2/util.py
    modified:
      storage/ndb/mcc/tst/tst_main.py
=== modified file 'storage/ndb/mcc/tst/tst_main.py'
--- a/storage/ndb/mcc/tst/tst_main.py	2012-11-19 13:00:44 +0000
+++ b/storage/ndb/mcc/tst/tst_main.py	2012-11-21 12:50:33 +0000
@@ -25,13 +25,13 @@ import sys
 sys.path += ['..', '/usr/local/lib/bzr-2.1.0-2010.03/lib/python2.6/site-packages', '/usr/local/lib/bzr-2.1.0/lib/python/site-packages' ]
 
 import logging
-if pyminor < 7:
+#if pyminor < 7:
 #    sys.path += ['/export/home/tmp/src/python/unittest2-0.5.1', '/home/dtjeldvo/unittest2-0.5.1' ]
     print('Running with Python version %s', 
           str(platform.python_version_tuple()))
     import unittest2 as unittest
-else:
-    import unittest
+#else:
+#    import unittest
 utmod = unittest
 
 import traceback    

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4110 to 4111) Dyre Tjeldvoll21 Nov