Skip to contentSkip to conversation

tests: Unique test path for /string-visitor/output

PATCH Applied Dr. David Alan Gilbert (git) 4 participants 4 messages Oct 5, 2015 – Oct 8, 2015

lore
Share & tools
lore

Dr. David Alan Gilbert (git)

author
#0 lore raw

PATCH 1/1 tests: Unique test path for /string-visitor/output

From: "Dr. David Alan Gilbert" <[email protected]>

Newer GLib's want unique test paths, and thus moan at dupes. (Seen on Fedora 23 which has glib 2.46)

Uniqueify the paths.

Signed-off-by Dr. David Alan Gilbert <[email protected]>
---
 tests/test-string-output-visitor.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
tests/test-string-output-visitor.c +8 -8
index 101fb27..fd5e67b 100644
@@ -248,39 +248,39 @@ int main(int argc, char **argv)
 
     output_visitor_test_add("/string-visitor/output/int",
                             &out_visitor_data, test_visitor_out_int, false);
-    output_visitor_test_add("/string-visitor/output/int",
+    output_visitor_test_add("/string-visitor/output/int-human",
                             &out_visitor_data, test_visitor_out_int, true);
     output_visitor_test_add("/string-visitor/output/bool",
                             &out_visitor_data, test_visitor_out_bool, false);
-    output_visitor_test_add("/string-visitor/output/bool",
+    output_visitor_test_add("/string-visitor/output/bool-human",
                             &out_visitor_data, test_visitor_out_bool, true);
     output_visitor_test_add("/string-visitor/output/number",
                             &out_visitor_data, test_visitor_out_number, false);
-    output_visitor_test_add("/string-visitor/output/number",
+    output_visitor_test_add("/string-visitor/output/number-human",
                             &out_visitor_data, test_visitor_out_number, true);
     output_visitor_test_add("/string-visitor/output/string",
                             &out_visitor_data, test_visitor_out_string, false);
-    output_visitor_test_add("/string-visitor/output/string",
+    output_visitor_test_add("/string-visitor/output/string-human",
                             &out_visitor_data, test_visitor_out_string, true);
     output_visitor_test_add("/string-visitor/output/no-string",
                             &out_visitor_data, test_visitor_out_no_string,
                             false);
-    output_visitor_test_add("/string-visitor/output/no-string",
+    output_visitor_test_add("/string-visitor/output/no-string-human",
                             &out_visitor_data, test_visitor_out_no_string,
                             true);
     output_visitor_test_add("/string-visitor/output/enum",
                             &out_visitor_data, test_visitor_out_enum, false);
-    output_visitor_test_add("/string-visitor/output/enum",
+    output_visitor_test_add("/string-visitor/output/enum-human",
                             &out_visitor_data, test_visitor_out_enum, true);
     output_visitor_test_add("/string-visitor/output/enum-errors",
                             &out_visitor_data, test_visitor_out_enum_errors,
                             false);
-    output_visitor_test_add("/string-visitor/output/enum-errors",
+    output_visitor_test_add("/string-visitor/output/enum-errors-human",
                             &out_visitor_data, test_visitor_out_enum_errors,
                             true);
     output_visitor_test_add("/string-visitor/output/intList",
                             &out_visitor_data, test_visitor_out_intList, false);
-    output_visitor_test_add("/string-visitor/output/intList",
+    output_visitor_test_add("/string-visitor/output/intList-human",
                             &out_visitor_data, test_visitor_out_intList, true);
 
     g_test_run();
Signature · 1 line
2.5.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Newer GLib's want unique test paths, and thus moan at dupes. (Seen on Fedora 23 which has glib 2.46)

Uniqueify the paths.

Not sure if "Uniquify" is any better spelling for a made-up word?

Quoted 5 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>
---
 tests/test-string-output-visitor.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
Reviewed-by Eric Blake <[email protected]>
Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Applied
#2 lore raw
Quoted 9 lines · Eric Blake
Quoted 6 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Newer GLib's want unique test paths, and thus moan at dupes. (Seen on Fedora 23 which has glib 2.46)

Uniqueify the paths.

Not sure if "Uniquify" is any better spelling for a made-up word?

It looks like "Uniquify" actually is a word in use (and I for one used it before myself).

Applied to -trivial, with the spelling fix from Eric :)

Thanks!

/mjt

Reviewed-by on v1 1/1
#3 lore raw
In reply to Dr. David Alan Gilbert (git)

Am 05.10.2015 um 13:04 schrieb Dr. David Alan Gilbert (git):

Quoted 11 lines

From: "Dr. David Alan Gilbert" <[email protected]>

Newer GLib's want unique test paths, and thus moan at dupes. (Seen on Fedora 23 which has glib 2.46)

Uniqueify the paths.

Signed-off-by Dr. David Alan Gilbert <[email protected]>
---
 tests/test-string-output-visitor.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Same problem on openSUSE Tumbleweed,

Reviewed-by Andreas Färber <[email protected]>

Thanks,
Andreas

Signature · 2 lines
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)