Check full stream equality when deduplicating

Previously, we assumed that any two streams having the same NSVCA
were identical. Now we can actually test for full equality before
dropping one while deduplicating. Note that this will result in a
hard failure if they aren't identical, because this means that the
enabled repositories are providing conflicting data.

Fixes: fedora-modularity#188

Signed-off-by: Stephen Gallagher <[email protected]>

modulemd/v2/modulemd-module.c

@@ -329,10 +329,17 @@ modulemd_module_add_stream (ModulemdModule *self,
        * favor of the new one.
        */
 
-      /* TODO: Do a full equality check on the two ModuleStreams once
-       * https://github.com/fedora-modularity/libmodulemd/issues/186 is
-       * fixed.
-       */
+      if (!modulemd_module_stream_equals (old, stream))
+        {
+          /* The two streams have matching NSVCA, but differ in content */
+          g_set_error (error,
+                       MODULEMD_ERROR,
+                       MODULEMD_ERROR_VALIDATE,
+                       "Encountered two streams with matching NSVCA %s but "
+                       "differing content",
+                       modulemd_module_stream_get_NSVCA_as_string (stream));
+          return MD_MODULESTREAM_VERSION_ERROR;
+        }
 
       /* First, drop the existing stream */
       g_ptr_array_remove (self->streams, old);

modulemd/v2/tests/test-modulemd-merger.c

@@ -90,8 +90,8 @@ merger_test_deduplicate (CommonMmdTestFixture *fixture,
 
   /* Resolve the merge, which should deduplicate all entries */
   merged_index = modulemd_module_index_merger_resolve (merger, &error);
+  g_assert_no_error (error);
   g_assert_nonnull (merged_index);
-  g_assert_null (error);
 
   deduplicated = modulemd_module_index_dump_to_string (merged_index, &error);
   g_assert_nonnull (deduplicated);