From: radhika <radhika@curoverse.com>
Date: Thu, 16 Jul 2015 13:05:54 +0000 (-0400)
Subject: 6473: some more error tests
X-Git-Tag: 1.1.0~1478^2~14
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a45c162ac02bb261fc65d3d59b446f0610c3ab8f

6473: some more error tests
---

diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py
index 6889c6f1fb..6d0a2f2079 100644
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -38,10 +38,10 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
             poll_fallback=False, expect_type=arvados.events.EventClient)
 
     def test_subscribe_websocket_with_start_time_today(self):
-        lastHour = datetime.today() - timedelta(hours = 1)
+        now = datetime.today()
         self._test_subscribe(
             poll_fallback=False, expect_type=arvados.events.EventClient,
-                additional_filters=[['created_at', '>', lastHour.strftime('%Y-%m-%d')]])
+                additional_filters=[['created_at', '>', now.strftime('%Y-%m-%d')]])
 
     def test_subscribe_websocket_with_start_time_last_hour(self):
         lastHour = datetime.today() - timedelta(hours = 1)
@@ -56,6 +56,25 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
                 poll_fallback=False, expect_type=arvados.events.EventClient,
                     additional_filters=[['created_at', '>', nextHour.strftime('%Y-%m-%d %H:%M:%S')]])
 
+    def test_subscribe_websocket_with_start_time_tomorrow(self):
+        tomorrow = datetime.today() + timedelta(hours = 24)
+        with self.assertRaises(Queue.Empty):
+            self._test_subscribe(
+                poll_fallback=False, expect_type=arvados.events.EventClient,
+                    additional_filters=[['created_at', '>', tomorrow.strftime('%Y-%m-%d')]])
+
+    def test_subscribe_websocket_with_start_time_incorrect_date_format(self):
+        now = datetime.today()
+        self._test_subscribe(
+            poll_fallback=False, expect_type=arvados.events.EventClient,
+                additional_filters=[['created_at', '>', now.strftime('%Y-%m')]])
+
+    def test_subscribe_websocket_with_start_time_incorrect_time_format(self):
+        now = datetime.today()
+        self._test_subscribe(
+            poll_fallback=False, expect_type=arvados.events.EventClient,
+                additional_filters=[['created_at', '>', now.strftime('%Y-%m-%d %H:%M')]])
+
     @mock.patch('arvados.events.EventClient.__init__')
     def test_subscribe_poll(self, event_client_constr):
         event_client_constr.side_effect = Exception('All is well')