Improve skip-if for topology variations

Author: bjori

tests/test-libmongoc.c

@@ -1001,12 +1001,6 @@ test_framework_is_replset (void)
    return is_replset;
 }
 
-int
-test_framework_skip_if_single (void)
-{
-   return (test_framework_is_mongos () || test_framework_is_replset());
-}
-
 bool
 test_framework_server_is_secondary (mongoc_client_t *client,
                                     uint32_t server_id)
@@ -1173,6 +1167,12 @@ test_version_cmp (void)
    ASSERT (v3_2_0_rc1_pre < test_framework_str_to_version ("3.2"));
 }
 
+int
+test_framework_skip_if_single (void)
+{
+   return (test_framework_is_mongos () || test_framework_is_replset());
+}
+
 int
 test_framework_skip_if_mongos (void)
 {
@@ -1185,6 +1185,24 @@ test_framework_skip_if_replset (void)
    return test_framework_is_replset() ? 0 : 1;
 }
 
+int
+test_framework_skip_if_not_single (void)
+{
+   return !test_framework_skip_if_single ();
+}
+
+int
+test_framework_skip_if_not_mongos (void)
+{
+   return !test_framework_skip_if_mongos ();
+}
+
+int
+test_framework_skip_if_not_replset (void)
+{
+   return !test_framework_skip_if_replset ();
+}
+
 int test_framework_skip_if_max_version_version_less_than_4 (void)
 {
    return test_framework_max_wire_version_at_least (4);

tests/test-libmongoc.h

@@ -58,6 +58,9 @@ int test_framework_skip_if_mongos  (void);
 int test_framework_skip_if_replset (void);
 int test_framework_skip_if_single  (void);
 int test_framework_skip_if_windows (void);
+int test_framework_skip_if_not_mongos  (void);
+int test_framework_skip_if_not_replset (void);
+int test_framework_skip_if_not_single  (void);
 
 typedef struct _debug_stream_stats_t {
    mongoc_client_t *client;