geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [1/4] geode git commit: [GEODE-1923] Remove FlakyTest and apply Spotless.
Date Tue, 24 Jan 2017 18:14:34 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 55c1e6454 -> 610ae1df2


[GEODE-1923] Remove FlakyTest and apply Spotless.

*  Remove FlakyTest from `FixedPRSinglehopDUnitTest.test_FPAmetadataFetch`
* `./gradlew spotlessApply`


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/988dca81
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/988dca81
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/988dca81

Branch: refs/heads/develop
Commit: 988dca81c1f9c0cdfbfd98c862cad6799999d670
Parents: 5e61f0e
Author: Galen O'Sullivan <gosullivan@pivotal.io>
Authored: Thu Dec 8 10:01:35 2016 -0800
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Tue Jan 24 10:13:25 2017 -0800

----------------------------------------------------------------------
 .../cache/FixedPRSinglehopDUnitTest.java        | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/988dca81/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
index e156043..3e42414 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -260,7 +260,6 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
    * Validate that the metadata are fetched and then later up one more partition and do some
    * operations on them. It should fetch new fpa.
    */
-  @Category(FlakyTest.class) // GEODE-1923
   @Test
   public void test_FPAmetadataFetch() {
 
@@ -295,12 +294,11 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
       putIntoPartitionedRegionsThreeQs();
 
       getFromPartitionedRegionsFor3Qs();
-      Awaitility.await().atMost(15, TimeUnit.SECONDS).until(() ->
-        // Server 1 is actually primary for both Q1 and Q2, since there is no FPA server
with
-        // primary set to true.
-        (server1.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer()) == 6)
&&
-        (server2.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer()) == 3)
-      );
+      // Server 1 is actually primary for both Q1 and Q2, since there is no FPA server with
+      // primary set to true.
+      Awaitility.await().atMost(15, TimeUnit.SECONDS).until(
+          () -> (server1.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer())
== 6)
+              && (server2.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer())
== 3));
 
       // TODO: Verify that all the fpa's are in the map
       server1.invoke(() -> FixedPRSinglehopDUnitTest.printView());
@@ -327,11 +325,10 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
 
       putIntoPartitionedRegions();
       // Wait to make sure that the buckets have actually moved.
-      Awaitility.await().atMost(15, TimeUnit.SECONDS).until(() ->
-        (server1.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer()) == 3)
&&
-        (server2.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer()) == 3)
&&
-        (server4.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer()) == 6)
-      );
+      Awaitility.await().atMost(15, TimeUnit.SECONDS).until(
+          () -> (server1.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer())
== 3)
+              && (server2.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer())
== 3)
+              && (server4.invoke(() -> FixedPRSinglehopDUnitTest.primaryBucketsOnServer())
== 6));
 
       getFromPartitionedRegions();
       server1.invoke(() -> FixedPRSinglehopDUnitTest.printView());


Mime
View raw message