Fix parallel build

Author: rogerdahl

conftest.py

@@ -310,11 +310,8 @@ def mn_client_v1_v2(request):
 @pytest.fixture(scope='session', autouse=True)
 def set_unique_sciobj_store_path(request):
   tmp_store_path = os.path.join(
-    tempfile.gettempdir(), 'gmn_test_obj_store_{}{}'.format(
-      d1_test.instance_generator.random_data.random_lower_ascii(
-        min_len=12, max_len=12
-      ), get_xdist_suffix(request)
-    )
+    tempfile.gettempdir(),
+    'gmn_test_obj_store_{}'.format(get_xdist_unique_suffix(request))
   )
   django.conf.settings.OBJECT_STORE_PATH = tmp_store_path
   d1_gmn.app.sciobj_store.create_clean_tmp_store()
@@ -326,46 +323,50 @@ def set_unique_sciobj_store_path(request):
 @pytest.yield_fixture(scope='session')
 def django_db_setup(request, django_db_blocker):
   """Set up DB fixture
+  When running in parallel with xdist, this is called once for each worker.
+  By default, the number of workers is the same as the number of CPU cores.
   """
   logging.info('Setting up DB fixture')
 
   test_db_key = 'default'
-  test_db_name = django.conf.settings.DATABASES[test_db_key]['NAME']
-  test_db_name += get_xdist_suffix(request)
+  test_db_name = ''.join([
+    django.conf.settings.DATABASES[test_db_key]['NAME'],
+    get_xdist_unique_suffix(request),
+  ])
   django.conf.settings.DATABASES[test_db_key]['NAME'] = test_db_name
 
   template_db_key = 'template'
   template_db_name = django.conf.settings.DATABASES[template_db_key]['NAME']
 
   with django_db_blocker.unblock():
+
     if pytest.config.getoption('--fixture-regen'):
       drop_database(test_db_name)
       create_blank_db(test_db_key, test_db_name)
       django.db.connections[test_db_key].commit()
       pytest.exit('Database dropped and reinitialized. Now run mk_db_fixture')
 
-    try:
-      load_template_fixture(template_db_key, template_db_name)
-    except psycopg2.DatabaseError as e:
-      logging.error(str(e))
+    # try:
+    #   load_template_fixture(template_db_key, template_db_name)
+    # except psycopg2.DatabaseError as e:
+    #   logging.error(str(e))
+
     drop_database(test_db_name)
     create_db_from_template(test_db_name, template_db_name)
-    # Haven't found out how to prevent transactions from being started, so
-    # closing the implicit transaction here so that template fixture remains
-    # available.
-    django.db.connections[test_db_key].commit()
+
+    # # Haven't found out how to prevent transactions from being started, so
+    # # closing the implicit transaction here so that template fixture remains
+    # # available.
+    # django.db.connections[test_db_key].commit()
+
     migrate_db(test_db_key)
-    logging.debug('Test DB ready')
+
     yield
 
+    for connection in django.db.connections.all():
+      connection.close()
 
-def get_xdist_suffix(request):
-  """When running in parallel with xdist, each thread gets a different suffix.
-  - In parallel run, return '_gw1', etc.
-  - In single run, return ''.
-  """
-  s = getattr(request.config, 'slaveinput', {}).get('slaveid')
-  return '_{}'.format(s) if s is not None else ''
+    drop_database(test_db_name)
 
 
 def create_db_from_template(test_db_name, template_db_name):
@@ -407,6 +408,10 @@ def migrate_db(test_db_key):
 
 def drop_database(db_name):
   logging.debug('Dropping database: {}'.format(db_name))
+
+  for connection in django.db.connections.all():
+    connection.close()
+
   run_sql('postgres', 'drop database if exists {};'.format(db_name))
 
 
@@ -436,3 +441,20 @@ def run_sql(db, sql):
     conn.close()
     for connection in django.db.connections.all():
       connection.close()
+
+
+def get_xdist_unique_suffix(request):
+  return ''.join([
+    d1_test.instance_generator.random_data.random_lower_ascii(
+      min_len=12, max_len=12
+    ), get_xdist_suffix(request)
+  ])
+
+
+def get_xdist_suffix(request):
+  """When running in parallel with xdist, each thread gets a different suffix.
+  - In parallel run, return '_gw1', etc.
+  - In single run, return ''.
+  """
+  s = getattr(request.config, 'slaveinput', {}).get('slaveid')
+  return '_{}'.format(s) if s is not None else ''

gmn/src/d1_gmn/tests/gmn_mock.py

@@ -245,3 +245,12 @@ def disable_management_command_logging():
   log messages when the commands are launched multiple times"""
   with mock.patch('d1_gmn.app.management.commands._util.log_setup'):
     yield
+
+
+@contextlib2.contextmanager
+def disable_management_command_concurrent_instance_check():
+  """Allow concurrent instances of the same management command"""
+  with mock.patch(
+      'd1_gmn.app.management.commands._util.exit_if_other_instance_is_running'
+  ):
+    yield

gmn/src/d1_gmn/tests/gmn_test_case.py

@@ -64,6 +64,7 @@
 import d1_client.mnclient_2_0
 import d1_client.session
 
+import django.core.management
 import django.db
 import django.test
 
@@ -534,3 +535,9 @@ def get_random_pid_sample(self, n_pids):
       ],
       n_pids,
     )
+
+  def call_management_command(self, *args, **kwargs):
+    with self.mock.disable_management_command_logging():
+      with self.mock.disable_management_command_concurrent_instance_check():
+        #with d1_test.d1_test_case.disable_debug_level_logging():
+        django.core.management.call_command(*args, **kwargs)

gmn/src/d1_gmn/tests/test_mgmt_cert.py

@@ -38,17 +38,15 @@ def _cert_whitelist(self, caplog):
     )
     with self.mock.disable_management_command_logging():
       with d1_test.d1_test_case.disable_debug_level_logging():
-        django.core.management.call_command('cert', 'whitelist', cert_path)
-        django.core.management.call_command('whitelist', 'view', cert_path)
+        self.call_management_command('cert', 'whitelist', cert_path)
+        self.call_management_command('whitelist', 'view', cert_path)
       return d1_test.d1_test_case.get_caplog_text(caplog)
 
   def test_1000(self, caplog):
     """cert view <pem>: Lists subjects from DN and SubjectInfo
     """
     cert_path = self.sample.get_path('cert_with_full_subject_info.pem')
-    with self.mock.disable_management_command_logging():
-      with d1_test.d1_test_case.disable_debug_level_logging():
-        django.core.management.call_command('cert', 'view', cert_path)
+    self.call_management_command('cert', 'view', cert_path)
     self.sample.assert_equals(
       d1_test.d1_test_case.get_caplog_text(caplog), 'view'
     )

gmn/src/d1_gmn/tests/test_mgmt_diag_export_object_list.py

@@ -27,11 +27,6 @@
 
 import d1_gmn.tests.gmn_test_case
 
-import d1_test.d1_test_case
-
-import django.core.management
-import django.utils.six
-
 
 # TODO:
 @pytest.mark.skip('Disabled until move to "diag" mgmt cmd completed')
@@ -40,11 +35,9 @@ def test_1000(self):
     """diag_export_object_list
     """
     with tempfile.NamedTemporaryFile() as exp_f:
-      with self.mock.disable_management_command_logging():
-        with d1_test.d1_test_case.disable_debug_level_logging():
-          django.core.management.call_command(
-            'diag_export_object_list', '--limit', 10, exp_f.name
-          )
+      self.call_management_command(
+        'diag_export_object_list', '--limit', 10, exp_f.name
+      )
       exp_f.seek(0)
       obj_list = exp_f.read()
       self.sample.assert_equals(obj_list, 'diag_export_object_list')

gmn/src/d1_gmn/tests/test_mgmt_diag_repair_revision_chains.py

@@ -31,18 +31,13 @@
 
 import d1_test.d1_test_case
 
-import django.core.management
-import django.utils.six
-
 
 # TODO:
 @pytest.mark.skip('Disabled until move to "diag" mgmt cmd completed')
 @d1_test.d1_test_case.reproducible_random_decorator('TestMgmtFixChains')
 class TestMgmtFixChains(d1_gmn.tests.gmn_test_case.GMNTestCase):
   def _call_diag_repair_revision_chains(self):
-    with self.mock.disable_management_command_logging():
-      with d1_test.d1_test_case.disable_debug_level_logging():
-        django.core.management.call_command('diag_repair_revision_chains')
+    self.call_management_command('diag_repair_revision_chains')
 
   def _get_rev_list(self):
     return [(

gmn/src/d1_gmn/tests/test_mgmt_diag_update_sysmeta.py

@@ -35,9 +35,6 @@
 import d1_test.d1_test_case
 import d1_test.instance_generator.system_metadata
 
-import django.core.management
-import django.utils.six
-
 N_SYSMETA_DOCS = 10
 
 
@@ -62,11 +59,9 @@ def _create_test_dir_with_sysmeta_docs(self, client):
     return tmp_dir_path, tmp_file_list, rnd_pid_list
 
   def _call_diag_update_sysmeta(self, *args, **kwargs):
-    with self.mock.disable_management_command_logging():
-      with d1_test.d1_test_case.disable_debug_level_logging():
-        django.core.management.call_command(
-          'diag_update_sysmeta', '--debug', *args, **kwargs
-        )
+    self.call_management_command(
+      'diag_update_sysmeta', '--debug', *args, **kwargs
+    )
 
   def test_1000(self, mn_client_v2):
     """diag_update_sysmeta: local XML docs

gmn/src/d1_gmn/tests/test_mgmt_import.py

@@ -33,9 +33,6 @@
 import d1_test.mock_api.get_system_metadata as mock_get_system_metadata
 import d1_test.mock_api.list_objects as mock_object_list
 
-import django
-import django.core.management
-
 
 @d1_test.d1_test_case.reproducible_random_decorator('TestMgmtImport')
 class TestMgmtImport(d1_gmn.tests.gmn_test_case.GMNTestCase):
@@ -49,12 +46,10 @@ def test_1000(self, caplog):
       )
       mock_get.add_callback(d1_test.d1_test_case.MOCK_REMOTE_BASE_URL)
 
-      with self.mock.disable_management_command_logging():
-        with d1_test.d1_test_case.disable_debug_level_logging():
-          django.core.management.call_command(
-            'import', '--force', '--major=2',
-            d1_test.d1_test_case.MOCK_REMOTE_BASE_URL
-          )
+      self.call_management_command(
+        'import', '--force', '--major=2',
+        d1_test.d1_test_case.MOCK_REMOTE_BASE_URL
+      )
 
     self.sample.assert_equals(
       d1_test.d1_test_case.get_caplog_text(caplog), 'import'

gmn/src/d1_gmn/tests/test_system_metadata_changed.py

@@ -36,12 +36,15 @@
 
 import d1_common
 import d1_common.date_time
+import d1_common.types.exceptions
 import d1_common.xml
 
 import d1_test.d1_test_case
 import d1_test.mock_api.get_system_metadata
 
 import django
+import django.conf
+import django.core.management
 
 
 @d1_test.d1_test_case.reproducible_random_decorator('TestSystemMetadataChanged')
@@ -51,9 +54,7 @@ def _call_process_refresh_queue(self):
     d1_test.mock_api.get_system_metadata.add_callback(
       django.conf.settings.DATAONE_ROOT
     )
-    with self.mock.disable_management_command_logging():
-      with d1_test.d1_test_case.disable_debug_level_logging():
-        django.core.management.call_command('process_refresh_queue', '--debug')
+    self.call_management_command('process_refresh_queue', '--debug')
 
   @responses.activate
   def test_1000(self, mn_client_v1_v2):