annotate test/test_init.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 198b6e810c67
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5248
198b6e810c67 Use Python-3-compatible 'as' syntax for except statements
Eric S. Raymond <esr@thyrsus.com>
parents: 5037
diff changeset
1 #-*- encoding: utf-8 -*-
4816
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
2
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
3 import unittest, os, pprint, difflib, textwrap
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
4
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
5 from roundup.init import loadTemplateInfo
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
6
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
7
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
8 class TemplateInfoTestCase(unittest.TestCase):
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
9 def testLoadTemplateInfo(self):
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
10 path = os.path.join(os.path.dirname(__file__),
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
11 '../share/roundup/templates/classic')
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
12 self.maxDiff = None
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
13 self.assertEqual(
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
14 loadTemplateInfo(path),
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
15 {
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
16 'description': textwrap.dedent('''\
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
17 This is a generic issue tracker that may be used to track bugs,
4818
edb171528a7d init.loadTemplateInfo: replace rfc822 with email.parser (Python 3 compatible)
anatoly techtonik <techtonik@gmail.com>
parents: 4816
diff changeset
18 feature requests, project issues or any number of other types
edb171528a7d init.loadTemplateInfo: replace rfc822 with email.parser (Python 3 compatible)
anatoly techtonik <techtonik@gmail.com>
parents: 4816
diff changeset
19 of issues. Most users of Roundup will find that this template
edb171528a7d init.loadTemplateInfo: replace rfc822 with email.parser (Python 3 compatible)
anatoly techtonik <techtonik@gmail.com>
parents: 4816
diff changeset
20 suits them, with perhaps a few customisations.'''),
4816
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
21 'intended-for': 'All first-time Roundup users',
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
22 'name': 'classic',
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
23 'path': path
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
24 }
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
25 )
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
26
9b3e09a50d85 init.loadTemplateInfo: Add test
anatoly techtonik <techtonik@gmail.com>
parents:
diff changeset
27 # vim: set et sts=4 sw=4 :

Roundup Issue Tracker: http://roundup-tracker.org/