List:Commits« Previous MessageNext Message »
From:Dyre Tjeldvoll Date:November 9 2012 1:44pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4105 to 4106)
View as plain text  
 4106 Dyre Tjeldvoll	2012-11-09
      Log the python version used in testing. Drop command exec in mtr test

    modified:
      mysql-test/suite/ndb/t/mcc_pyunit.test
      storage/ndb/mcc/tst/tst_main.py
 4105 Dyre Tjeldvoll	2012-11-09
      Allow python interpreter to be passed to mtr test in env variable and modify unit tests to use MYSQL_TMP_DIR when available

    modified:
      mysql-test/suite/ndb/t/mcc_pyunit.test
      storage/ndb/mcc/tst/tst_main.py
=== modified file 'mysql-test/suite/ndb/t/mcc_pyunit.test'
--- a/mysql-test/suite/ndb/t/mcc_pyunit.test	2012-11-09 09:19:01 +0000
+++ b/mysql-test/suite/ndb/t/mcc_pyunit.test	2012-11-09 13:44:21 +0000
@@ -1,7 +1,7 @@
 --perl
 use strict;
 
-warn `env`;
+#warn `env`;
 my $tstdir = "../storage/ndb/mcc/tst";
 # Assume source package layout first... then try install/package layout
 unless (-f "$tstdir/tst_main.py") { 
@@ -12,7 +12,7 @@ unless (-f "$tstdir/tst_main.py") { 
 }
 warn "tst_main.py found in: $tstdir";
 chdir($tstdir);
-warn `pwd`;
+#warn `pwd`;
 
 my $python = $ENV{'MCC_PYTHON'};
 unless ($python) { $python = "python"; }

=== modified file 'storage/ndb/mcc/tst/tst_main.py'
--- a/storage/ndb/mcc/tst/tst_main.py	2012-11-09 09:19:01 +0000
+++ b/storage/ndb/mcc/tst/tst_main.py	2012-11-09 13:44:21 +0000
@@ -24,8 +24,11 @@ import sys
 # Paramiko from Bazaar 
 sys.path += ['..', '/usr/local/lib/bzr-2.1.0-2010.03/lib/python2.6/site-packages']
 
+import logging
 if pyminor < 7:
     sys.path += ['/export/home/tmp/src/python/unittest2-0.5.1', '/home/dtjeldvo/unittest2-0.5.1' ]
+    logging.debug('Running with Python version %s', 
+                  str(platform.python_version_tuple()))
     import unittest2 as unittest
 else:
     import unittest
@@ -41,7 +44,7 @@ import os.path
 import tempfile
 import os
 import platform
-import logging
+
 
 import request_handler
 import config_parser

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