PiperOrigin-RevId: 676977787
pull/18406/head
Protobuf Team Bot 5 months ago committed by Copybara-Service
parent 030fcadb88
commit 83569cff3d
  1. 7
      java/core/src/main/java/com/google/protobuf/RuntimeVersion.java
  2. 17
      java/core/src/test/java/com/google/protobuf/RuntimeVersionTest.java
  3. 16
      python/google/protobuf/internal/runtime_version_test.py
  4. 8
      python/google/protobuf/runtime_version.py

@ -118,13 +118,6 @@ public final class RuntimeVersion {
"Detected incompatible Protobuf Gencode/Runtime versions when loading %s: gencode %s,"
+ " runtime %s. Runtime version cannot be older than the linked gencode version.",
location, gencodeVersionString, VERSION_STRING));
} else if ((MINOR > minor || PATCH > patch) && minorWarningLoggedCount < MAX_WARNING_COUNT) {
logger.warning(
String.format(
" Protobuf gencode version %s is older than the runtime version %s at %s. Please"
+ " avoid checked-in Protobuf gencode that can be obsolete.",
gencodeVersionString, VERSION_STRING, location));
minorWarningLoggedCount++;
}
// Check that runtime version suffix is the same as the gencode version suffix.

@ -146,23 +146,6 @@ public final class RuntimeVersionTest {
+ " testing.Foo");
}
@Test
public void versionValidation_warnOlderGencodeVersion() {
TestUtil.TestLogHandler logHandler = new TestUtil.TestLogHandler();
Logger logger = Logger.getLogger(RuntimeVersion.class.getName());
logger.addHandler(logHandler);
RuntimeVersion.validateProtobufGencodeVersion(
RuntimeVersion.DOMAIN,
RuntimeVersion.MAJOR,
RuntimeVersion.MINOR - 1,
RuntimeVersion.PATCH,
RuntimeVersion.SUFFIX,
"dummy");
assertThat(logHandler.getStoredLogRecords()).hasSize(1);
assertThat(logHandler.getStoredLogRecords().get(0).getMessage())
.contains("Please avoid checked-in Protobuf gencode that can be obsolete.");
}
@Test
public void versionValidation_gencodeOneMajorVersionOlderWarning() {
TestUtil.TestLogHandler logHandler = new TestUtil.TestLogHandler();

@ -118,22 +118,6 @@ class RuntimeVersionTest(unittest.TestCase):
'foo.proto',
)
def test_gencode_older_than_runtime_version_warning(self):
with self.assertWarnsRegex(
Warning,
expected_regex=(
'Please avoid checked-in Protobuf gencode that can be obsolete.'
),
):
runtime_version.ValidateProtobufRuntimeVersion(
runtime_version.DOMAIN,
runtime_version.MAJOR,
runtime_version.MINOR - 1,
runtime_version.PATCH,
runtime_version.SUFFIX,
'foo.proto',
)
def test_gencode_one_major_version_older_warning(self):
with self.assertWarnsRegex(
Warning, expected_regex='is exactly one major version older'

@ -115,14 +115,6 @@ def ValidateProtobufRuntimeVersion(
f' {location}: gencode {gen_version} runtime {version}. Runtime version'
f' cannot be older than the linked gencode version. {error_prompt}'
)
elif MINOR > gen_minor or PATCH > gen_patch:
if _warning_count < _MAX_WARNING_COUNT:
warnings.warn(
'Protobuf gencode version %s is older than the runtime version %s at'
' %s. Please avoid checked-in Protobuf gencode that can be obsolete.'
% (gen_version, version, location)
)
_warning_count += 1
if gen_suffix != SUFFIX:
_ReportVersionError(

Loading…
Cancel
Save