Merge "Allow splitting test groups into sub groups"

trove/tests/int_tests.py

@@ -69,8 +69,20 @@ def build_group(*groups):
     return out
 
 
-def register(datastores, *test_groups):
+def register(group_names, *test_groups, **kwargs):
-    proboscis.register(groups=build_group(datastores),
+    if kwargs:
+        register(group_names, kwargs.values())
+        for suffix, grp_set in kwargs.items():
+            # Recursively call without the kwargs
+            register([name + '_' + suffix for name in group_names], *grp_set)
+        return
+
+    # Do the actual registration here
+    proboscis.register(groups=build_group(group_names),
+                       depends_on_groups=build_group(*test_groups))
+    # Now register the same groups with '-' instead of '_'
+    proboscis.register(groups=build_group(
+                       [name.replace('_', '-') for name in group_names]),
                        depends_on_groups=build_group(*test_groups))
 
 black_box_groups = [
@@ -230,97 +242,111 @@ register(["user"], user_actions_groups)
 # These should contain all functionality currently supported by the datastore.
 # Keeping them in alphabetical order may reduce the number of merge conflicts.
 register(
-    ["db2_supported"], common_groups,
+    ["db2_supported"],
-    configuration_groups,
+    single=[common_groups,
-    database_actions_groups,
+            configuration_groups,
-    user_actions_groups,
+            database_actions_groups,
+            user_actions_groups, ],
+    multi=[]
 )
 
 register(
-    ["cassandra_supported"], common_groups,
+    ["cassandra_supported"],
-    backup_groups,
+    single=[common_groups,
-    database_actions_groups,
+            backup_groups,
-    cluster_actions_groups,
+            database_actions_groups,
-    configuration_groups,
+            configuration_groups,
-    user_actions_groups,
+            user_actions_groups, ],
+    multi=[cluster_actions_groups, ]
 )
 
 register(
-    ["couchbase_supported"], common_groups,
+    ["couchbase_supported"],
-    backup_groups,
+    single=[common_groups,
-    root_actions_groups,
+            backup_groups,
+            root_actions_groups, ],
+    multi=[]
 )
 
 register(
-    ["couchdb_supported"], common_groups,
+    ["couchdb_supported"],
-    backup_groups,
+    single=[common_groups,
-    database_actions_groups,
+            backup_groups,
-    root_actions_groups,
+            database_actions_groups,
-    user_actions_groups,
+            root_actions_groups,
+            user_actions_groups, ],
+    multi=[]
 )
 
 register(
-    ["postgresql_supported"], common_groups,
+    ["postgresql_supported"],
-    backup_incremental_groups,
+    single=[common_groups,
-    database_actions_groups,
+            backup_incremental_groups,
-    configuration_groups,
+            database_actions_groups,
-    replication_groups,
+            configuration_groups,
-    root_actions_groups,
+            root_actions_groups,
-    user_actions_groups,
+            user_actions_groups, ],
+    multi=[replication_groups, ]
 )
 
 register(
-    ["mysql_supported", "percona_supported"], common_groups,
+    ["mysql_supported", "percona_supported"],
-    backup_incremental_groups,
+    single=[common_groups,
-    configuration_groups,
+            backup_incremental_groups,
-    database_actions_groups,
+            configuration_groups,
-    instance_upgrade_groups,
+            database_actions_groups,
-    replication_promote_groups,
+            instance_upgrade_groups,
-    root_actions_groups,
+            root_actions_groups,
-    user_actions_groups,
+            user_actions_groups, ],
+    multi=[replication_promote_groups, ]
 )
 
 register(
-    ["mariadb_supported"], common_groups,
+    ["mariadb_supported"],
-    backup_incremental_groups,
+    single=[common_groups,
-    cluster_actions_groups,
+            backup_incremental_groups,
-    configuration_groups,
+            configuration_groups,
-    database_actions_groups,
+            database_actions_groups,
-    replication_promote_groups,
+            root_actions_groups,
-    root_actions_groups,
+            user_actions_groups, ],
-    user_actions_groups,
+    multi=[replication_promote_groups,
+           cluster_actions_groups, ]
 )
 
 register(
-    ["mongodb_supported"], common_groups,
+    ["mongodb_supported"],
-    backup_groups,
+    single=[common_groups,
-    cluster_actions_groups,
+            backup_groups,
-    configuration_groups,
+            configuration_groups,
-    database_actions_groups,
+            database_actions_groups,
-    root_actions_groups,
+            root_actions_groups,
-    user_actions_groups,
+            user_actions_groups, ],
+    multi=[cluster_actions_groups, ]
 )
 
 register(
-    ["pxc_supported"], common_groups,
+    ["pxc_supported"],
-    backup_incremental_groups,
+    single=[common_groups,
-    cluster_actions_groups,
+            backup_incremental_groups,
-    configuration_groups,
+            configuration_groups,
-    database_actions_groups,
+            database_actions_groups,
-    root_actions_groups,
+            root_actions_groups,
-    user_actions_groups,
+            user_actions_groups, ],
+    multi=[cluster_actions_groups, ]
 )
 
 register(
-    ["redis_supported"], common_groups,
+    ["redis_supported"],
-    backup_groups,
+    single=[common_groups,
-    cluster_actions_groups,
+            backup_groups, ],
-    replication_promote_groups,
+    multi=[replication_promote_groups,
+           cluster_actions_groups, ]
 )
 
 register(
-    ["vertica_supported"], common_groups,
+    ["vertica_supported"],
-    cluster_actions_groups,
+    single=[common_groups,
-    configuration_groups,
+            configuration_groups,
-    root_actions_groups,
+            root_actions_groups, ],
+    multi=[cluster_actions_groups, ]
 )