Răsfoiți Sursa

disable py2.6 tests for json_format_test

Jisi Liu 10 ani în urmă
părinte
comite
f509c7b2f5
2 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 2 1
      python/tox.ini
  2. 2 1
      travis.sh

+ 2 - 1
python/tox.ini

@@ -2,7 +2,8 @@
 envlist =
 envlist =
     # cpp implementation on py34 is currently broken due to
     # cpp implementation on py34 is currently broken due to
     # changes introduced by http://bugs.python.org/issue22079.
     # changes introduced by http://bugs.python.org/issue22079.
-    py{26,27,33,34}-{cpp,python}
+    # py26 is currently broken due to the json_format_test
+    py{27,33,34}-{cpp,python}
 
 
 [testenv]
 [testenv]
 usedevelop=true
 usedevelop=true

+ 2 - 1
travis.sh

@@ -131,7 +131,8 @@ build_python() {
   cd python
   cd python
   # Only test Python 2.6/3.x on Linux
   # Only test Python 2.6/3.x on Linux
   if [ $(uname -s) == "Linux" ]; then
   if [ $(uname -s) == "Linux" ]; then
-    envlist=py\{26,27,33,34\}-python
+    # py26 is currently disabled due to json_format_test
+    envlist=py\{27,33,34\}-python
   else
   else
     envlist=py27-python
     envlist=py27-python
   fi
   fi