From 29c81e6c092fc3e2677b7c189ff22828a8586fa6 Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@zalando.de>
Date: Thu, 14 Jan 2021 18:19:58 +0100
Subject: [PATCH] test increased timeout on github

---
 e2e/scripts/watch_objects.sh | 4 +++-
 e2e/tests/test_e2e.py        | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/e2e/scripts/watch_objects.sh b/e2e/scripts/watch_objects.sh
index 4c9b82404..fc3cc167b 100755
--- a/e2e/scripts/watch_objects.sh
+++ b/e2e/scripts/watch_objects.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-watch -c "
+watch -n 0.1 -c "
 kubectl get postgresql --all-namespaces
 echo
+kubectl exec \$(kubectl get pod -l name=postgres-operator --no-headers) -- curl -s localhost:8080/workers/all/status/ | jq .
+echo
 echo -n 'Rolling upgrade pending: '
 kubectl get statefulset -o jsonpath='{.items..metadata.annotations.zalando-postgres-operator-rolling-update-required}'
 echo
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index dd70e0257..16646b02c 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -35,7 +35,7 @@ class EndToEndTestCase(unittest.TestCase):
     # `kind` pods may stuck in the `Terminating` phase for a few minutes; hence high test timeout
     TEST_TIMEOUT_SEC = 600
 
-    def eventuallyEqual(self, f, x, m, retries=60, interval=2):
+    def eventuallyEqual(self, f, x, m, retries=60, interval=3):
         while True:
             try:
                 y = f()
@@ -47,7 +47,7 @@ class EndToEndTestCase(unittest.TestCase):
                     raise
                 time.sleep(interval)
 
-    def eventuallyNotEqual(self, f, x, m, retries=60, interval=2):
+    def eventuallyNotEqual(self, f, x, m, retries=60, interval=3):
         while True:
             try:
                 y = f()
@@ -59,7 +59,7 @@ class EndToEndTestCase(unittest.TestCase):
                     raise
                 time.sleep(interval)
 
-    def eventuallyTrue(self, f, m, retries=60, interval=2):
+    def eventuallyTrue(self, f, m, retries=60, interval=3):
         while True:
             try:
                 self.assertTrue(f(), m)
@@ -929,7 +929,6 @@ class EndToEndTestCase(unittest.TestCase):
         new_master_node = nm[0]
         self.assert_distributed_pods(new_master_node, new_replica_nodes, cluster_label)
 
-    @unittest.skip("flaky test, to be fixed later")
     @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
     def test_node_affinity(self):
         '''