tests reshuffle

Author: opaduchak

tasks/__init__.py

@@ -345,9 +345,7 @@ def test_module(ctx, module=None, numprocesses=None, nocapture=False, params=Non
     'api_tests/schemas',
     'api_tests/providers',
     'api_tests/preprints',
-    'api_tests/registrations',
-    'api_tests/registries_moderation',
-    'api_tests/users',
+
 ]
 API_TESTS2 = [
     'api_tests/cedar_metadata_records',
@@ -360,9 +358,7 @@ def test_module(ctx, module=None, numprocesses=None, nocapture=False, params=Non
     'api_tests/requests',
     'api_tests/resources',
     'api_tests/schema_responses',
-    'api_tests/subscriptions',
-    'api_tests/waffle',
-    'api_tests/wb',
+
 ]
 API_TESTS3 = [
     'api_tests/actions',
@@ -391,8 +387,21 @@ def test_module(ctx, module=None, numprocesses=None, nocapture=False, params=Non
     'api_tests/share',
     'api_tests/wikis',
 ]
+API_TESTS4 = [
+    'api_tests/registrations',
+    'api_tests/registries_moderation',
+    'api_tests/subscriptions',
+    'api_tests/users',
+    'api_tests/waffle',
+    'api_tests/wb',
+]
 ADDON_TESTS = [
-    'addons',
+    'addons/base',
+    'addons/boa',
+    'addons/forward',
+    'addons/osfstorage',
+    'addons/twofactor',
+    'addons/wiki',
 ]
 ADMIN_TESTS = [
     'admin_tests',
@@ -408,8 +417,8 @@ def test_osf(ctx, numprocesses=None, coverage=False, testmon=False, junit=False)
 @task
 def test_website(ctx, numprocesses=None, coverage=False, testmon=False, junit=False):
     """Run the old test suite."""
-    print(f'Testing modules "{WEBSITE_TESTS}"')
-    test_module(ctx, module=WEBSITE_TESTS, numprocesses=numprocesses, coverage=coverage, testmon=testmon, junit=junit)
+    print(f'Testing modules "{WEBSITE_TESTS + API_TESTS4}"')
+    test_module(ctx, module=WEBSITE_TESTS + API_TESTS4, numprocesses=numprocesses, coverage=coverage, testmon=testmon, junit=junit)
 
 @task
 def test_api1(ctx, numprocesses=None, coverage=False, testmon=False, junit=False):
@@ -428,9 +437,9 @@ def test_api2(ctx, numprocesses=None, coverage=False, testmon=False, junit=False
 @task
 def test_api3(ctx, numprocesses=None, coverage=False, testmon=False, junit=False):
     """Run the API test suite."""
-    print(f'Testing modules "{API_TESTS3 + OSF_TESTS}"')
+    print(f'Testing modules "{API_TESTS3}"')
     # NOTE: There may be some concurrency issues with ES
-    test_module(ctx, module=API_TESTS3 + OSF_TESTS, numprocesses=numprocesses, coverage=coverage, testmon=testmon, junit=junit)
+    test_module(ctx, module=API_TESTS3, numprocesses=numprocesses, coverage=coverage, testmon=testmon, junit=junit)
 
 
 @task
@@ -444,8 +453,8 @@ def test_admin(ctx, numprocesses=None, coverage=False, testmon=False, junit=Fals
 def test_addons(ctx, numprocesses=None, coverage=False, testmon=False, junit=False):
     """Run all the tests in the addons directory.
     """
-    print(f'Testing modules "{ADDON_TESTS + ADMIN_TESTS}"')
-    test_module(ctx, module=ADDON_TESTS + ADMIN_TESTS, numprocesses=numprocesses, coverage=coverage, testmon=testmon, junit=junit)
+    print(f'Testing modules "{ADDON_TESTS + ADMIN_TESTS + OSF_TESTS}"')
+    test_module(ctx, module=ADDON_TESTS + ADMIN_TESTS + OSF_TESTS, numprocesses=numprocesses, coverage=coverage, testmon=testmon, junit=junit)
 
 
 @task