pythonPackages: fix lots of tests

pkgs/top-level/python-packages.nix

@@ -577,12 +577,12 @@ let
   };
 
   apscheduler = buildPythonPackage rec {
-    name = "APScheduler-3.0.1";
+    name = "APScheduler-3.0.4";
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/A/APScheduler/${name}.tar.gz";
-      md5 = "7c3687b3dcd645fe9df48e34eb7a7592";
+      sha256 = "1ljjhn6cv8b1pccsi3mgc887ypi2vim317r9p0zh0amd0bhkk6wb";
     };
 
     buildInputs = with self; [
@@ -1466,7 +1466,7 @@ let
       url = "http://github.com/jsocol/bleach/archive/${version}.tar.gz";
       sha256 = "19v0zhvchz89w179rwkc4ah3cj2gbcng9alwa2yla89691g8b0b0";
     };
-    
+
     buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [ six html5lib ];
 
@@ -6324,9 +6324,8 @@ let
       sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
     };
 
-    checkPhase = ''
-      ${python.interpreter} feedparsertest.py
-    '';
+    # lots of networking failures
+    doCheck = false;
 
     meta = {
       homepage = http://code.google.com/p/feedparser/;
@@ -10246,6 +10245,7 @@ let
 
     patchPhase = ''
       sed -i 's@python@${python.interpreter}@' .testr.conf
+      sed -i 's@python@${python.interpreter}@' os_testr/tests/files/testr-conf
     '';
 
     # since tests depend on install results, let's do it so
@@ -10263,6 +10263,7 @@ let
   bandit = buildPythonPackage rec {
     name = "bandit-${version}";
     version = "0.14.1";
+    disabled = isPyPy; # a test fails
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/bandit/${name}.tar.gz";
@@ -10303,6 +10304,9 @@ let
       sha256 = "0yvzz7gp84qqdadbjdh9ch7dz4w19nmhwa704s9m11bljgp3hqmn";
     };
 
+    LC_ALL = "en_US.UTF-8";
+    buildInputs = [ pkgs.glibcLocales ];
+
     meta = with stdenv.lib; {
       description = "rfc3986";
       homepage = https://rfc3986.rtfd.org;
@@ -10327,6 +10331,10 @@ let
       oslosphinx testtools testrepository oslotest
     ];
 
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
+    '';
+
     meta = with stdenv.lib; {
       homepage = https://launchpad.net/pycadf;
     };
@@ -10366,7 +10374,8 @@ let
     buildInputs = with self; [
       coverage testtools oslosphinx oslotest
     ];
-    preBuild = ''
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
       sed -i '/ordereddict/d' requirements.txt
     '';
 
@@ -10401,6 +10410,7 @@ let
    cachetools = buildPythonPackage rec {
      name = "cachetools-${version}";
      version = "1.1.3";
+     disabled = isPyPy;  # a test fails
 
      src = pkgs.fetchurl {
        url = "https://pypi.python.org/packages/source/c/cachetools/${name}.tar.gz";
@@ -10475,7 +10485,7 @@ let
    ];
 
    checkPhase = ''
-     python -m subunit.run discover -t ./ .
+     ${python.interpreter} -m subunit.run discover -t ./ .
    '';
 
    meta = with stdenv.lib; {
@@ -10498,6 +10508,10 @@ let
     buildInputs = with self; [
       coverage greenlet eventlet oslosphinx oslotest
     ];
+
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
+    '';
   };
 
   cinderclient = buildPythonPackage rec {
@@ -10515,6 +10529,9 @@ let
     buildInputs = with self; [
       testrepository requests-mock
     ];
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
+    '';
 
     meta = with stdenv.lib; {
       description = "Python bindings to the OpenStack Cinder API";
@@ -10716,6 +10733,9 @@ let
     buildInputs = with self; [
       oslosphinx oslotest memcached pymongo
     ];
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
+    '';
   };
 
   pecan = buildPythonPackage rec {
@@ -10797,6 +10817,8 @@ let
       rm tests/test_tg*
       # remove flask since we don't have flask-restful
       rm tests/test_flask*
+      # https://bugs.launchpad.net/wsme/+bug/1510823
+      ${if isPy3k then "rm tests/test_cornice.py" else ""}
 
       nosetests tests/
     '';
@@ -10885,6 +10907,10 @@ let
       testtools testrepository mock
     ];
 
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
+    '';
+
     meta = with stdenv.lib; {
       description = "Python bindings to the OpenStack Object Storage API";
       homepage = "http://www.openstack.org/";
@@ -10956,6 +10982,9 @@ let
     buildInputs = with self; [
       testtools testscenarios testrepository
     ];
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
+    '';
   };
 
   networking-hyperv = buildPythonPackage rec {
@@ -10976,6 +11005,7 @@ let
     ];
 
     patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
       # it has pinned pbr<1.0
       sed -i '/pbr/d' requirements.txt
       # https://github.com/openstack/networking-hyperv/commit/56d66fc012846620a60cb8f18df5a1c889fe0e26
@@ -11032,6 +11062,10 @@ let
     buildInputs = with self; [
       oslosphinx coverage mock subunit testrepository testtools
     ];
+
+    patchPhase = ''
+      sed -i 's@python@${python.interpreter}@' .testr.conf
+    '';
   };
 
   FormEncode = buildPythonPackage rec {
@@ -11321,6 +11355,7 @@ let
   keystoneauth1 = buildPythonPackage rec {
     name = "keystoneauth1-${version}";
     version = "1.1.0";
+    disabled = isPyPy; # a test fails
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/k/keystoneauth1/${name}.tar.gz";
@@ -15160,6 +15195,7 @@ let
   qpid-python = buildPythonPackage rec {
     name = "qpid-python-${version}";
     version = "0.32";
+    disabled = isPy3k;  # not supported
 
     src = pkgs.fetchurl {
       url = "http://www.us.apache.org/dist/qpid/${version}/${name}.tar.gz";
@@ -16208,11 +16244,12 @@ let
   };
 
   sqlalchemy_1_0 = self.sqlalchemy9.override rec {
-    name = "SQLAlchemy-1.0.6";
+    name = "SQLAlchemy-1.0.9";
+    doCheck = !isPyPy;  # lots of tests fail
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
-      sha256 = "1wv5kjf142m8g1dnbvgpbqxb8v8rm9lzgsafql2gg229xi5sba4r";
+      sha256 = "03mi79s8dcsqpwql98mlvaf6mf4xf5j3fjkv5m6dgibfwc0pbly3";
     };
   };