aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/internal/unknown_fields_test.py
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2015-01-13 14:47:32 -0500
committerTres Seaver <tseaver@palladion.com>2015-01-13 14:47:32 -0500
commit7ee25830c6707540242f441df5cd1c2a2000ca58 (patch)
treebd1ae22f8180b0e3aa4f341413c503eb55b38321 /python/google/protobuf/internal/unknown_fields_test.py
parent052e0205a76717f39fc65e303fd2b92ab1df3028 (diff)
downloadprotobuf-7ee25830c6707540242f441df5cd1c2a2000ca58.tar.gz
protobuf-7ee25830c6707540242f441df5cd1c2a2000ca58.tar.bz2
protobuf-7ee25830c6707540242f441df5cd1c2a2000ca58.zip
Drop dependency on 'google.apputils'.
Use stdlib's 'unittest' instead.
Diffstat (limited to 'python/google/protobuf/internal/unknown_fields_test.py')
-rwxr-xr-xpython/google/protobuf/internal/unknown_fields_test.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/python/google/protobuf/internal/unknown_fields_test.py b/python/google/protobuf/internal/unknown_fields_test.py
index a4dc1f7c..0650d92b 100755
--- a/python/google/protobuf/internal/unknown_fields_test.py
+++ b/python/google/protobuf/internal/unknown_fields_test.py
@@ -35,7 +35,8 @@
__author__ = 'bohdank@google.com (Bohdan Koval)'
-from google.apputils import basetest
+import unittest
+
from google.protobuf import unittest_mset_pb2
from google.protobuf import unittest_pb2
from google.protobuf.internal import api_implementation
@@ -45,10 +46,10 @@ from google.protobuf.internal import test_util
from google.protobuf.internal import type_checkers
-@basetest.unittest.skipIf(
+@unittest.skipIf(
api_implementation.Type() == 'cpp' and api_implementation.Version() == 2,
'C++ implementation does not expose unknown fields to Python')
-class UnknownFieldsTest(basetest.TestCase):
+class UnknownFieldsTest(unittest.TestCase):
def setUp(self):
self.descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
@@ -179,10 +180,10 @@ class UnknownFieldsTest(basetest.TestCase):
self.assertNotEqual(self.empty_message, message)
-@basetest.unittest.skipIf(
+@unittest.skipIf(
api_implementation.Type() == 'cpp' and api_implementation.Version() == 2,
'C++ implementation does not expose unknown fields to Python')
-class UnknownEnumValuesTest(basetest.TestCase):
+class UnknownEnumValuesTest(unittest.TestCase):
def setUp(self):
self.descriptor = missing_enum_values_pb2.TestEnumValues.DESCRIPTOR
@@ -235,4 +236,4 @@ class UnknownEnumValuesTest(basetest.TestCase):
if __name__ == '__main__':
- basetest.main()
+ unittest.main()