Fix single event e2e tests in eventhub (#593)

* Fix eventhub e2e test should use same event hub

* Remove retry catch in event hub e2e tests

Author: Hazhzeng

tests/endtoend/eventhub_functions/eventhub_output/function.json

@@ -11,7 +11,7 @@
       "type": "eventHub",
       "name": "event",
       "direction": "out",
-      "eventHubName": "python-worker-ci",
+      "eventHubName": "python-worker-ci-eventhub-one",
       "connection": "AzureWebJobsEventHubConnectionString"
     },
     {

tests/endtoend/eventhub_functions/eventhub_trigger/function.json

@@ -6,7 +6,7 @@
       "type": "eventHubTrigger",
       "name": "event",
       "direction": "in",
-      "eventHubName": "python-worker-eventhub-ci-linux",
+      "eventHubName": "python-worker-ci-eventhub-one",
       "connection": "AzureWebJobsEventHubConnectionString"
     },
     {

tests/endtoend/test_eventhub_batch_functions.py

@@ -23,7 +23,7 @@ def test_eventhub_multiple(self):
         self._set_table_partition_key(partition_key)
 
         # wait for host to restart after change
-        time.sleep(1)
+        time.sleep(5)
 
         docs = []
         for i in range(NUM_EVENTS):
@@ -34,35 +34,25 @@ def test_eventhub_multiple(self):
                                  data=json.dumps(docs))
         self.assertEqual(r.status_code, 200)
 
-        max_retries = 30
-
         row_keys = [str(i) for i in range(NUM_EVENTS)]
         seen = [False] * NUM_EVENTS
         row_keys_seen = dict(zip(row_keys, seen))
-        for try_no in range(max_retries):
-            # Allow trigger to fire.
-            time.sleep(2)
-
-            try:
-                r = self.webhost.request('GET',
-                                         'get_eventhub_batch_triggered')
-                self.assertEqual(r.status_code, 200)
-                entries = r.json()
-                for entry in entries:
-                    self.assertEqual(entry['PartitionKey'], partition_key)
-                    row_key = entry['RowKey']
-                    row_keys_seen[row_key] = True
-
-                self.assertDictEqual(all_row_keys_seen, row_keys_seen)
-
-            except AssertionError as e:
-                if try_no == max_retries - 1:
-                    self._cleanup(old_partition_key)
-                    raise
-            else:
-                break
-
-        self._cleanup(old_partition_key)
+
+        # Allow trigger to fire.
+        time.sleep(5)
+
+        try:
+            r = self.webhost.request('GET', 'get_eventhub_batch_triggered')
+            self.assertEqual(r.status_code, 200)
+            entries = r.json()
+            for entry in entries:
+                self.assertEqual(entry['PartitionKey'], partition_key)
+                row_key = entry['RowKey']
+                row_keys_seen[row_key] = True
+
+            self.assertDictEqual(all_row_keys_seen, row_keys_seen)
+        finally:
+            self._cleanup(old_partition_key)
 
     def _cleanup(self, old_partition_key):
         self._set_table_partition_key(old_partition_key)

tests/endtoend/test_eventhub_functions.py

@@ -20,24 +20,12 @@ def test_eventhub_trigger(self):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.text, 'OK')
 
-        max_retries = 30
-
-        for try_no in range(max_retries):
-            # Allow trigger to fire.
-            time.sleep(2)
-
-            try:
-                # Check that the trigger has fired.
-                r = self.webhost.request('GET', 'get_eventhub_triggered')
-                self.assertEqual(r.status_code, 200)
-                response = r.json()
-
-                self.assertEqual(
-                    response,
-                    doc
-                )
-            except AssertionError as e:
-                if try_no == max_retries - 1:
-                    raise
-            else:
-                break
+        # Allow trigger to fire.
+        time.sleep(5)
+
+        # Check that the trigger has fired.
+        r = self.webhost.request('GET', 'get_eventhub_triggered')
+        self.assertEqual(r.status_code, 200)
+        response = r.json()
+
+        self.assertEqual(response, doc)