← Back to branch summary

~didrocks/unity/altf10

« back to all changes in this revision

Viewing changes to grackle/tests/test_client.py

  • Committer: Curtis Hovey
  • Date: 2012-02-14 22:49:46 UTC
  • Revision ID: curtis.hovey@canonical.com-20120214224946-rx83gm3er2pho566
Raise UnparsableDateRange when the date cannot be parsed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grackle/tests/test_client.py
117
117
        if 'date_range' in parameters:
118
118
            try:
119
119
                start_date, end_date = parameters['date_range'].split('..')
120
 
            except:
121
 
                raise UnparsableDateRange()
 
120
            except ValueError:
 
121
                raise UnparsableDateRange
122
122
        new_messages = []
123
123
        for message in messages:
124
124
            if (not parameters['include_hidden'] and message['hidden']):
281
281
                self.send_response(httplib.OK)
282
282
                self.end_headers()
283
283
                self.wfile.write(simplejson.dumps(response))
284
 
            except UnsupportedOrder:
285
 
                self.send_response(
286
 
                    httplib.BAD_REQUEST, UnsupportedOrder.__doc__)
287
 
                return
288
 
            except UnsupportedDisplayType:
289
 
                self.send_response(
290
 
                    httplib.BAD_REQUEST, UnsupportedDisplayType.__doc__)
 
284
            except Exception, error:
 
285
                self.send_response(
 
286
                    httplib.BAD_REQUEST, error.__doc__)
291
287
                return
292
288
 
293
289
    def log_message(self, format, *args):
565
561
                'baz', date_range='2012-01-01..2012-01-31')
566
562
        ids = sorted(m['message_id'] for m in response['messages'])
567
563
        self.assertEqual(['bar', 'naf', 'qux'], ids)
 
564
 
 
565
    def test_date_range_unparsabledaterange(self):
 
566
        client = GrackleClient('localhost', 8448)
 
567
        archive = {'baz': [make_message('foo', body=u'abcdefghi')]}
 
568
        with ForkedFakeService.from_client(client, archive):
 
569
            with ExpectedException(UnparsableDateRange, ''):
 
570
                client.get_messages('baz', date_range='2012-01-01')