Mercurial > p > roundup > code
view test/test_mailsplit.py @ 7723:8147f6deac9f
fix(db): Make using pg_service work again.
When I did the merge of schema support I broke pg_service.conf support
by replacing get_database_name with db_schema_split. This commit
fixes it.
Also this commit returns the schema if one is specified in
pg_service.conf.
back_postgresql.py:
Replace calls to db_schema_split() with get_database_schema_names()
(new name for get_database_name()). Rename db_schema_split to
_db_schema_split. It now returns a tuple (dbname, schema) rather
than a list. It is used only by get_database_schema_names() which
also returns tuples.
get_database_schema_names() can also get schema info for the service
(if present) as specified by pg_service.conf.
Add get_database_user() to get the user from either RDBMS_USER or
pg_service.conf. (User needed for creating schema, so not needed
before schema patch.
import re at the top of file and remove lower import.
Remove some schema code from db_command as it's not needed. The
database conection is done to either postgresql or template1
existing databases. This command never connects to the roundp
specified db.
test/test_postgresql.py:
Reorganize top level imports, add import os. Replace import of
db_schema_split with get_database_schema_names. Also replace calls
to db_schema_split.
Create new Opener for the service file. Set PGSERVICEFILE to point
to test/pg_service.conf.
Add three new classes to test Service:
1) using regular db
2) using schema within db
3) Unable to parse schema name from pg_service.conf.
The last doesn't need a db. Number 1 and 2 reuse the tests in ROTest
to verify db connectivity.
test/pg_service.conf:
three service connections for: db only, db and schema, and incorrectly
specified schema test cases.
doc/upgrading.txt:
updated to current status. Included example schema definition in
service file.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Thu, 28 Dec 2023 15:13:42 -0500 |
| parents | 55f09ca366c4 |
| children |
line wrap: on
line source
# # Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/) # This module is free software, and you may redistribute it and/or modify # under the same terms as Python, so long as this copyright message and # disclaimer are retained in their original form. # # IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR # DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING # OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # # BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. import unittest from roundup.mailgw import parseContent class MailsplitTestCase(unittest.TestCase): def testPreComment(self): s = ''' blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah blah blah blah blah blah blah blah blah blah blah blah! issue_tracker@foo.com wrote: > blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah > blah blah blah blah blah blah blah blah blah? blah blah blah blah blah > blah blah blah blah blah blah blah... blah blah blah blah. blah blah > blah blah blah blah? blah blah blah blah blah blah! blah blah! > > ------- > nosy: userfoo, userken > _________________________________________________ > Roundup issue tracker > issue_tracker@foo.com > http://foo.com/cgi-bin/roundup.cgi/issue_tracker/ -- blah blah blah signature userfoo@foo.com ''' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah') self.assertEqual(content, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah\nblah blah blah blah blah blah blah blah blah blah blah!') def testPostComment(self): s = ''' issue_tracker@foo.com wrote: > blah blah blah blahblah blahblah blahblah blah blah blah blah blah > blah > blah blah blah blah blah blah blah blah blah? blah blah blah blah > blah > blah blah blah blah blah blah blah... blah blah blah blah. blah > blah > blah blah blah blah? blah blah blah blah blah blah! blah blah! > > ------- > nosy: userfoo, userken > _________________________________________________ > Roundup issue tracker > issue_tracker@foo.com > http://foo.com/cgi-bin/roundup.cgi/issue_tracker/ blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah blah blah blah blah blah blah blah blah blah blah blah! -- blah blah blah signature userfoo@foo.com ''' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah') self.assertEqual(content, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah\nblah blah blah blah blah blah blah blah blah blah blah!') def testKeepCitation(self): s = ''' blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah blah blah blah blah blah blah blah blah blah blah blah! issue_tracker@foo.com wrote: > blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah > blah blah blah blah blah blah blah blah blah? blah blah blah blah blah > blah blah blah blah blah blah blah... blah blah blah blah. blah blah > blah blah blah blah? blah blah blah blah blah blah! blah blah! > > ------- > nosy: userfoo, userken > _________________________________________________ > Roundup issue tracker > issue_tracker@foo.com > http://foo.com/cgi-bin/roundup.cgi/issue_tracker/ -- blah blah blah signature userfoo@foo.com ''' summary, content = parseContent(s, 1, 0) self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah') self.assertEqual(content, '''\ blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah blah blah blah blah blah blah blah blah blah blah blah! issue_tracker@foo.com wrote: > blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah > blah blah blah blah blah blah blah blah blah? blah blah blah blah blah > blah blah blah blah blah blah blah... blah blah blah blah. blah blah > blah blah blah blah? blah blah blah blah blah blah! blah blah! > > ------- > nosy: userfoo, userken > _________________________________________________ > Roundup issue tracker > issue_tracker@foo.com > http://foo.com/cgi-bin/roundup.cgi/issue_tracker/''') def testKeepBody(self): s = ''' blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah blah blah blah blah blah blah blah blah blah blah blah! issue_tracker@foo.com wrote: > blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah > blah blah blah blah blah blah blah blah blah? blah blah blah blah blah > blah blah blah blah blah blah blah... blah blah blah blah. blah blah > blah blah blah blah? blah blah blah blah blah blah! blah blah! > > ------- > nosy: userfoo, userken > _________________________________________________ > Roundup issue tracker > issue_tracker@foo.com > http://foo.com/cgi-bin/roundup.cgi/issue_tracker/ -- blah blah blah signature userfoo@foo.com ''' summary, content = parseContent(s, 0, 1) self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah') self.assertEqual(content, ''' blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah blah blah blah blah blah blah blah blah blah blah blah! issue_tracker@foo.com wrote: > blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah > blah blah blah blah blah blah blah blah blah? blah blah blah blah blah > blah blah blah blah blah blah blah... blah blah blah blah. blah blah > blah blah blah blah? blah blah blah blah blah blah! blah blah! > > ------- > nosy: userfoo, userken > _________________________________________________ > Roundup issue tracker > issue_tracker@foo.com > http://foo.com/cgi-bin/roundup.cgi/issue_tracker/ -- blah blah blah signature userfoo@foo.com ''') def testAllQuoted(self): s = '\nissue_tracker@foo.com wrote:\n> testing\n' summary, content = parseContent(s, 0, 1) self.assertEqual(summary, '') self.assertEqual(content, s) def testSimple(self): s = '''testing''' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, 'testing') self.assertEqual(content, 'testing') def testParagraphs(self): s = '''testing\n\ntesting\n\ntesting''' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, 'testing') self.assertEqual(content, 'testing\n\ntesting\n\ntesting') def testSimpleFollowup(self): s = '''>hello\ntesting''' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, 'testing') self.assertEqual(content, 'testing') def testSimpleFollowupParas(self): s = '''>hello\ntesting\n\ntesting\n\ntesting''' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, 'testing') self.assertEqual(content, 'testing\n\ntesting\n\ntesting') def testEmpty(self): s = '' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, '') self.assertEqual(content, '') def testIndentationSummary(self): s = ' Four space indent.\n\n Four space indent.\nNo indent.' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, ' Four space indent.') def testIndentationContent(self): s = ' Four space indent.\n\n Four space indent.\nNo indent.' summary, content = parseContent(s, 0, 0) self.assertEqual(content, s) def testMultilineSummary(self): s = 'This is a long sentence that would normally\nbe split. More words.' summary, content = parseContent(s, 0, 0) self.assertEqual(summary, 'This is a long sentence that would ' 'normally\nbe split.') def testKeepMultipleHyphens(self): body = '''Testing, testing. ---- Testing, testing.''' summary, content = parseContent(body, 1, 0) self.assertEqual(body, content) # vim: set filetype=python ts=4 sw=4 et si
