From 50f09ad3ef68a7976d3e80d612ff7aed623a13b0 Mon Sep 17 00:00:00 2001
From: Nico Kruber <nico@data-artisans.com>
Date: Fri, 5 Jan 2018 16:17:13 +0100
Subject: [PATCH] [hotfix][tests] move assertions out of the finally block

There was a potential for them to mask exceptions.
---
 .../partition/SpillableSubpartitionTest.java  | 51 +++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionTest.java
index 57aa82fe2e27b..924a2a0d58982 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionTest.java
@@ -413,10 +413,10 @@ private void testAddOnFinishedPartition(boolean spilled) throws Exception {
 				buffer.recycle();
 				Assert.fail("buffer not recycled");
 			}
-			// still same statistics
-			assertEquals(1, partition.getTotalNumberOfBuffers());
-			assertEquals(4, partition.getTotalNumberOfBytes());
 		}
+		// still same statistics
+		assertEquals(1, partition.getTotalNumberOfBuffers());
+		assertEquals(4, partition.getTotalNumberOfBytes());
 	}
 
 	/**
@@ -451,16 +451,20 @@ private void testAddOnReleasedPartition(boolean spilled) throws Exception {
 
 		Buffer buffer = new Buffer(MemorySegmentFactory.allocateUnpooledSegment(4096),
 			FreeingBufferRecycler.INSTANCE);
+		boolean bufferRecycled;
 		try {
 			partition.add(buffer);
 		} finally {
-			if (!buffer.isRecycled()) {
+			bufferRecycled = buffer.isRecycled();
+			if (!bufferRecycled) {
 				buffer.recycle();
-				Assert.fail("buffer not recycled");
 			}
-			assertEquals(0, partition.getTotalNumberOfBuffers());
-			assertEquals(0, partition.getTotalNumberOfBytes());
 		}
+		if (!bufferRecycled) {
+			Assert.fail("buffer not recycled");
+		}
+		assertEquals(0, partition.getTotalNumberOfBuffers());
+		assertEquals(0, partition.getTotalNumberOfBytes());
 	}
 
 	/**
@@ -476,17 +480,21 @@ public void testAddOnSpilledPartitionWithSlowWriter() throws Exception {
 
 		Buffer buffer = new Buffer(MemorySegmentFactory.allocateUnpooledSegment(4096),
 			FreeingBufferRecycler.INSTANCE);
+		boolean bufferRecycled;
 		try {
 			partition.add(buffer);
 		} finally {
 			ioManager.shutdown();
-			if (buffer.isRecycled()) {
-				Assert.fail("buffer recycled before the write operation completed");
+			bufferRecycled = buffer.isRecycled();
+			if (!bufferRecycled) {
+				buffer.recycle();
 			}
-			buffer.recycle();
-			assertEquals(1, partition.getTotalNumberOfBuffers());
-			assertEquals(4096, partition.getTotalNumberOfBytes());
 		}
+		if (bufferRecycled) {
+			Assert.fail("buffer recycled before the write operation completed");
+		}
+		assertEquals(1, partition.getTotalNumberOfBuffers());
+		assertEquals(4096, partition.getTotalNumberOfBytes());
 	}
 
 	/**
@@ -549,10 +557,10 @@ private void testReleaseOnSpillablePartitionWithSlowWriter(boolean createView) t
 			if (!buffer2.isRecycled()) {
 				buffer2.recycle();
 			}
-			// note: a view requires a finished partition which has an additional EndOfPartitionEvent
-			assertEquals(2 + (createView ? 1 : 0), partition.getTotalNumberOfBuffers());
-			assertEquals(4096 * 2 + (createView ? 4 : 0), partition.getTotalNumberOfBytes());
 		}
+		// note: a view requires a finished partition which has an additional EndOfPartitionEvent
+		assertEquals(2 + (createView ? 1 : 0), partition.getTotalNumberOfBuffers());
+		assertEquals(4096 * 2 + (createView ? 4 : 0), partition.getTotalNumberOfBytes());
 	}
 
 	/**
@@ -569,18 +577,21 @@ public void testAddOnSpilledPartitionWithFailingWriter() throws Exception {
 
 		Buffer buffer = new Buffer(MemorySegmentFactory.allocateUnpooledSegment(4096),
 			FreeingBufferRecycler.INSTANCE);
+		boolean bufferRecycled;
 		try {
 			partition.add(buffer);
 		} finally {
 			ioManager.shutdown();
-
-			if (!buffer.isRecycled()) {
+			bufferRecycled = buffer.isRecycled();
+			if (!bufferRecycled) {
 				buffer.recycle();
-				Assert.fail("buffer not recycled");
 			}
-			assertEquals(0, partition.getTotalNumberOfBuffers());
-			assertEquals(0, partition.getTotalNumberOfBytes());
 		}
+		if (!bufferRecycled) {
+			Assert.fail("buffer not recycled");
+		}
+		assertEquals(0, partition.getTotalNumberOfBuffers());
+		assertEquals(0, partition.getTotalNumberOfBytes());
 	}
 
 	private static class AwaitableBufferAvailablityListener implements BufferAvailabilityListener {