aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google
diff options
context:
space:
mode:
authorGravatar Jie Luo <jieluo@google.com>2017-08-04 10:50:24 -0700
committerGravatar Jie Luo <jieluo@google.com>2017-08-04 10:50:24 -0700
commit9150cd860302dfed741b54161243bbfe74b80584 (patch)
tree27e74c5b0859375f5e6a2dd67cd79c195edbd389 /python/google
parentd58df3b902f912859b8c3c5bbc980ac2eb91067c (diff)
Skip setUpClass which is newly added in python2.7 for python2.6
Diffstat (limited to 'python/google')
-rwxr-xr-xpython/google/protobuf/internal/message_test.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/google/protobuf/internal/message_test.py b/python/google/protobuf/internal/message_test.py
index e8b794f0..f11bb6d6 100755
--- a/python/google/protobuf/internal/message_test.py
+++ b/python/google/protobuf/internal/message_test.py
@@ -1832,8 +1832,9 @@ class PackedFieldTest(BaseTestCase):
self.assertEqual(golden_data, message.SerializeToString())
-@unittest.skipIf(api_implementation.Type() != 'cpp',
- 'explicit tests of the C++ implementation')
+@unittest.skipIf(api_implementation.Type() != 'cpp' or
+ sys.version_info < (2, 7),
+ 'explicit tests of the C++ implementation for PY27 and above')
class OversizeProtosTest(BaseTestCase):
@classmethod