kallithea Changeset - 3afc6bff84bb

Changeset - 3afc6bff84bb

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2020-10-10 20:04:51
mads@kiilerich.com

Grafted from: d7bd8c2dc13d

db_manage: drop special DbManage mode for tests

There is no need for a special mode - just use force_ask to answer yes to
"destroy old database".

2 files changed with 3 insertions and 5 deletions:

kallithea/lib/db_manage.py

kallithea/tests/fixture.py

0 comments (0 inline, 0 general)

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -46,15 +46,14 @@ from kallithea.model.user import UserMod @@
 log = logging.getLogger(__name__)
 class DbManage(object):
-    def __init__(self, dbconf, root, tests=False, SESSION=None, cli_args=None):
     def __init__(self, dbconf, root, SESSION=None, cli_args=None):
         self.dbname = dbconf.split('/')[-1]
         self.tests = tests
         self.root = root
         self.dburi = dbconf
         self.cli_args = cli_args or {}
         self.init_db(SESSION=SESSION)
     def _ask_ok(self, msg):
@@ @@ -84,13 +83,12 @@ class DbManage(object): @@
         database = url.database
         if reuse_database:
             log.info("The content of the database %r will be destroyed and new tables created." % database)
         else:
             log.info("The existing database %r will be destroyed and a new one created." % database)
         if not self.tests:
             if not self._ask_ok('Are you sure to destroy old database? [y/n]'):
                 print('Nothing done.')
                 sys.exit(0)
         if reuse_database:
             Base.metadata.drop_all()
@@ @@ -194,13 +192,13 @@ class DbManage(object): @@
         _path = self.cli_args.get('repos_location')
         if retries == 3:
             log.info('Setting up repositories config')
         if _path is not None:
             path = _path
-        elif not self.tests and not test_repo_path:
         elif not test_repo_path:
             path = input(
                  'Enter a valid absolute path to store repositories. '
                  'All repositories in that path will be added automatically:'
+            )
         else:
             path = test_repo_path

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -363,14 +363,14 @@ def create_test_env(repos_test_path, con @@
     # create test dir if it doesn't exist
     if not os.path.isdir(repos_test_path):
         log.debug('Creating testdir %s', repos_test_path)
         os.makedirs(repos_test_path)
     dbmanage = DbManage(dbconf=dbconf, root=config['here'],
                         tests=True,
                         cli_args={
                             'force_ask': True,
                             'username': TEST_USER_ADMIN_LOGIN,
                             'password': TEST_USER_ADMIN_PASS,
                             'email': TEST_USER_ADMIN_EMAIL,
                         })
     dbmanage.create_tables(reuse_database=reuse_database)
     # for tests dynamically set new root paths based on generated content

0 comments (0 inline, 0 general)