Merge branch 'master' into 6473-fetch-events-starting-at

[arvados.git] / sdk / python / tests / test_websockets.py

diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py
index b0367be92ce70139c696fb53dca9e093b07a676b..fc246ac61dd8f30b6ebc6e7ea6cb904c78c85b4a 100644 (file)
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -37,17 +37,17 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
             arvados.api('v1'), filters,
             events.put, poll_fallback=poll_fallback, last_log_id=last_log_id)
         self.assertIsInstance(self.ws, expect_type)
-        self.assertEqual(200, events.get(True, 10)['status'])
+        self.assertEqual(200, events.get(True, 5)['status'])
         human = arvados.api('v1').humans().create(body={}).execute()
 
         if last_log_id == None or expected == 0:
-            self.assertEqual(human['uuid'], events.get(True, 10)['object_uuid'])
+            self.assertEqual(human['uuid'], events.get(True, 5)['object_uuid'])
             self.assertTrue(events.empty(), "got more events than expected")
         else:
             log_events = []
-            for i in range(0, 10):
+            for i in range(0, 20):
                 try:
-                    event = events.get(True, 10)
+                    event = events.get(True, 5)
                     self.assertTrue(event['object_uuid'] is not None)
                     log_events.append(event['object_uuid'])
                 except:
@@ -61,11 +61,24 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
         self._test_subscribe(
             poll_fallback=False, expect_type=arvados.events.EventClient)
 
-    def test_subscribe_websocket_with_start_time_today(self):
-        now = datetime.today()
+    @mock.patch('arvados.events.EventClient.__init__')
+    def test_subscribe_poll(self, event_client_constr):
+        event_client_constr.side_effect = Exception('All is well')
+        self._test_subscribe(
+            poll_fallback=1, expect_type=arvados.events.PollClient)
+
+    def test_subscribe_websocket_with_start_time_date_only(self):
+        lastHour = datetime.today() - timedelta(hours = 1)
         self._test_subscribe(
             poll_fallback=False, expect_type=arvados.events.EventClient, last_log_id=1,
-                additional_filters=[['created_at', '>=', now.strftime('%Y-%m-%d')]])
+                additional_filters=[['created_at', '>=', lastHour.strftime('%Y-%m-%d')]])
+
+    @mock.patch('arvados.events.EventClient.__init__')
+    def test_poll_websocket_with_start_time_date_only(self, event_client_constr):
+        lastHour = datetime.today() - timedelta(hours = 1)
+        self._test_subscribe(
+            poll_fallback=1, expect_type=arvados.events.PollClient, last_log_id=1,
+                additional_filters=[['created_at', '>=', lastHour.strftime('%Y-%m-%d')]])
 
     def test_subscribe_websocket_with_start_time_last_hour(self):
         lastHour = datetime.today() - timedelta(hours = 1)
@@ -73,6 +86,13 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
             poll_fallback=False, expect_type=arvados.events.EventClient, last_log_id=1,
                 additional_filters=[['created_at', '>=', lastHour.strftime('%Y-%m-%d %H:%M:%S')]])
 
+    @mock.patch('arvados.events.EventClient.__init__')
+    def test_subscribe_poll_with_start_time_last_hour(self, event_client_constr):
+        lastHour = datetime.today() - timedelta(hours = 1)
+        self._test_subscribe(
+            poll_fallback=1, expect_type=arvados.events.PollClient, last_log_id=1,
+                additional_filters=[['created_at', '>=', lastHour.strftime('%Y-%m-%d %H:%M:%S')]])
+
     def test_subscribe_websocket_with_start_time_next_hour(self):
         nextHour = datetime.today() + timedelta(hours = 1)
         with self.assertRaises(Queue.Empty):
@@ -80,6 +100,14 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
                 poll_fallback=False, expect_type=arvados.events.EventClient, last_log_id=1,
                     additional_filters=[['created_at', '>=', nextHour.strftime('%Y-%m-%d %H:%M:%S')]], expected=0)
 
+    @mock.patch('arvados.events.EventClient.__init__')
+    def test_subscribe_poll_with_start_time_next_hour(self, event_client_constr):
+        nextHour = datetime.today() + timedelta(hours = 1)
+        with self.assertRaises(Queue.Empty):
+            self._test_subscribe(
+                poll_fallback=1, expect_type=arvados.events.PollClient, last_log_id=1,
+                    additional_filters=[['created_at', '>=', nextHour.strftime('%Y-%m-%d %H:%M:%S')]], expected=0)
+
     def test_subscribe_websocket_with_start_time_tomorrow(self):
         tomorrow = datetime.today() + timedelta(hours = 24)
         with self.assertRaises(Queue.Empty):
@@ -88,7 +116,9 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
                     additional_filters=[['created_at', '>=', tomorrow.strftime('%Y-%m-%d')]], expected=0)
 
     @mock.patch('arvados.events.EventClient.__init__')
-    def test_subscribe_poll(self, event_client_constr):
-        event_client_constr.side_effect = Exception('All is well')
-        self._test_subscribe(
-            poll_fallback=1, expect_type=arvados.events.PollClient)
+    def test_subscribe_poll_with_start_time_tomorrow(self, event_client_constr):
+        tomorrow = datetime.today() + timedelta(hours = 24)
+        with self.assertRaises(Queue.Empty):
+            self._test_subscribe(
+                poll_fallback=1, expect_type=arvados.events.PollClient, last_log_id=1,
+                    additional_filters=[['created_at', '>=', tomorrow.strftime('%Y-%m-%d')]], expected=0)