[avro] branch branch-1.9 updated: AVRO-2448: Make test for leaking FileDescriptors more resilient (#563)

[nkollar]

This is an automated email from the ASF dual-hosted git repository.

nkollar pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/branch-1.9 by this push:
     new e1043f5  AVRO-2448: Make test for leaking FileDescriptors more 
resilient (#563)
e1043f5 is described below

commit e1043f544d917a67a7bcf0e81136867b774eb94b
Author: Niels Basjes <nbas...@bol.com>
AuthorDate: Wed Jun 26 10:42:05 2019 +0200

    AVRO-2448: Make test for leaking FileDescriptors more resilient (#563)
    
    
    (cherry picked from commit 72dfbf02b62df5d313ebfd9343c22b034214ee49)
---
 .../avro/src/test/java/org/apache/avro/TestDataFileReader.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReader.java 
b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReader.java
index 1c90249..d4c184c 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReader.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestDataFileReader.java
@@ -17,7 +17,7 @@
  */
 package org.apache.avro;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
@@ -47,8 +47,11 @@ public class TestDataFileReader {
     }
     Files.delete(emptyFile);
 
-    assertEquals("File descriptor leaked from new DataFileReader()", 
openFilesBeforeOperation,
-        getNumberOfOpenFileDescriptors());
+    long openFilesAfterOperation = getNumberOfOpenFileDescriptors();
+
+    // Sometimes we have less open files because of a GC run during the test 
cycle.
+    assertTrue("File descriptor leaked from new DataFileReader() (expected:" + 
openFilesBeforeOperation + " actual:"
+        + openFilesAfterOperation + ")", openFilesBeforeOperation >= 
openFilesAfterOperation);
   }
 
   private long getNumberOfOpenFileDescriptors() {