No "N" aka nightly builds for years.
Change-Id: I138e50fdb609632803cc181e6828ce43f5ad5088
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng/+/190479
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java
index db75511..07a7f11 100644
--- a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java
+++ b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java
@@ -700,36 +700,30 @@
long MAX_ALLOWED_BYTES = 319;
String buildId = System.getProperty("buildId");
assertNotNull("buildId property must be specified for testComparatorLogSize test", buildId);
- String buildType = buildId.substring(0, 1);
// Comparator logs are not generated for N builds
- if (!buildType.equals("N")) {
- String downloadHost = getDownloadHost();
- String urlOfFile = "https://" + downloadHost + "/eclipse/downloads/drops4/"
- + buildId
- + "/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt";
- URL logURL = new URL(urlOfFile);
+ String downloadHost = getDownloadHost();
+ String urlOfFile = "https://" + downloadHost + "/eclipse/downloads/drops4/" + buildId
+ + "/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt";
+ URL logURL = new URL(urlOfFile);
- URLConnection urlConnection = logURL.openConnection();
- // urlConnection.connect();
- long nBytes = urlConnection.getContentLength();
- if (DEBUG_TEST) {
- System.out.println("Debug info for testComparatorLogSize");
- System.out.println("Debug: nBytes: " + nBytes);
- printHeaders(urlConnection);
- }
- // if find "response does not contain length, on a regular basis, for
- // some servers, will have to read contents.
- assertTrue(
- "Either file (url) does not exist, or HTTP response does not contain content length. urlOfFile: " + urlOfFile,
- (-1 != nBytes));
- assertTrue("Unanticipated comparator log file has increased in size, indicating a regression. See " + urlOfFile,
- nBytes <= MAX_ALLOWED_BYTES);
- if (MAX_ALLOWED_BYTES > (nBytes + 20)) {
- System.out.println("WARNING: MAX_ALLOWED_BYTES was larger than bytes found, by " + (MAX_ALLOWED_BYTES - nBytes)
- + ", which may indicate MAX_ALLOWED_BYTES needs to be lowered, to catch regressions.");
- }
- } else {
- System.out.println("noComparatorTestsForNBuilds");
+ URLConnection urlConnection = logURL.openConnection();
+ // urlConnection.connect();
+ long nBytes = urlConnection.getContentLength();
+ if (DEBUG_TEST) {
+ System.out.println("Debug info for testComparatorLogSize");
+ System.out.println("Debug: nBytes: " + nBytes);
+ printHeaders(urlConnection);
+ }
+ // if find "response does not contain length, on a regular basis, for
+ // some servers, will have to read contents.
+ assertTrue("Either file (url) does not exist, or HTTP response does not contain content length. urlOfFile: "
+ + urlOfFile, (-1 != nBytes));
+ assertTrue("Unanticipated comparator log file has increased in size, indicating a regression. See " + urlOfFile,
+ nBytes <= MAX_ALLOWED_BYTES);
+ if (MAX_ALLOWED_BYTES > (nBytes + 20)) {
+ System.out.println(
+ "WARNING: MAX_ALLOWED_BYTES was larger than bytes found, by " + (MAX_ALLOWED_BYTES - nBytes)
+ + ", which may indicate MAX_ALLOWED_BYTES needs to be lowered, to catch regressions.");
}
}
