summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2019-05-03 11:52:38 +0100
committerPaul Duffin <paulduffin@google.com>2019-05-03 13:10:08 +0100
commit1d31f9d5b8a321dc81d9846fcbc02a1d0d0b173a (patch)
treeed4a8eae4b8901176a21777467a8fddcc3a45104 /annotations/generate_annotated_java_files.py
parent255246a2109f430cd68da0dda5dc276cfdd2c4f4 (diff)
Avoid conflict with apache-harmony's FileHandlerTest
Stopping repackaging of external/apache-harmony tests changed the order in which tests were being run as tests were being run alphabetically. The repackaged tests com.android.org.apache.. ran before libcore.. tests. However, the original tests org.apache.. ran after libcore.. tests. That change in order revealed a conflict between the libcore OldFileHandlerTest and apache-harmony's FileHandlerTest. OldFileHandlerTest did not close all FileHandler instances it created. An unclosed FileHandler leaves an entry in the FileHandler.locks static set and that affected the name of the log file created in FileHandlerTest#testFileHandler which broke the test. Previously, that was not an issue because the FileHandlerTest ran first and it does close all its FileHandler instances. It was the FileHandler instance created in the setUp() method that was not being closed. As only one testFileHandler() actually used that it was simplest to just stop creating it in setUp() and instead push its creation into testFileHandler(). Bug: 131738612 Test: atest libcore.java.util.logging \ org.apache.harmony.logging.tests.java.util.logging Change-Id: I42324946487a97236dd80e4fd491a86657fa84b9
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions