diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-10 17:34:54 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-10 17:34:54 -0800 |
commit | 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e (patch) | |
tree | d17c61ff9f3ae28224fbddac6d26bfc59e2cf755 /src/google/protobuf/descriptor_pb2_test.py | |
parent | baca1a8a1aa180c42de6278d3b8286c4496c6a10 (diff) | |
download | protobuf-6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e.tar.gz protobuf-6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e.tar.bz2 protobuf-6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e.zip |
Down-integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/descriptor_pb2_test.py')
-rw-r--r-- | src/google/protobuf/descriptor_pb2_test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/descriptor_pb2_test.py b/src/google/protobuf/descriptor_pb2_test.py index 48a0d48a..c5a8d8a2 100644 --- a/src/google/protobuf/descriptor_pb2_test.py +++ b/src/google/protobuf/descriptor_pb2_test.py @@ -33,14 +33,14 @@ # Verify that prebuild and checkedin version of descriptor_pb2.py is up to date. from google3.pyglib import resources -import unittest +from google.apputils import basetest _DESC = 'google3/net/proto2/proto/descriptor_pb2.' _OLD = _DESC + 'py-prebuilt' _NEW = _DESC + 'compiled' -class PregeneratedFileChanged(unittest.TestCase): +class PregeneratedFileChanged(basetest.TestCase): def testSameText(self): generated = resources.GetResource(_NEW) @@ -51,4 +51,4 @@ class PregeneratedFileChanged(unittest.TestCase): 'regnerate a new version of %s and add it to your CL' % _OLD) if __name__ == '__main__': - unittest.main() + basetest.main() |