manually blacklist/whitelist message fields

faasm · Oct 15, 2021 · 5246a0e · 5246a0e
1 parent 6801be6
commit 5246a0e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 33 deletions.
diff --git a/tests/test/scheduler/test_exec_graph.cpp b/tests/test/scheduler/test_exec_graph.cpp
@@ -5,6 +5,7 @@
 #include <faabric/redis/Redis.h>
 #include <faabric/scheduler/MpiWorld.h>
 #include <faabric/scheduler/Scheduler.h>
+#include <faabric/util/config.h>
 #include <faabric/util/environment.h>
 #include <faabric/util/macros.h>
 
@@ -84,6 +85,13 @@ TEST_CASE_METHOD(MpiBaseTestFixture,
     std::vector<faabric::Message> messages(worldSize);
     for (int rank = 0; rank < worldSize; rank++) {
         messages.at(rank) = faabric::util::messageFactory("mpi", "hellompi");
+        messages.at(rank).set_id(0);
+        messages.at(rank).set_timestamp(0);
+        messages.at(rank).set_finishtimestamp(0);
+        messages.at(rank).set_resultkey("");
+        messages.at(rank).set_statuskey("");
+        messages.at(rank).set_executedhost(
+          faabric::util::getSystemConfig().endpointHost);
         messages.at(rank).set_ismpi(true);
         messages.at(rank).set_mpiworldid(worldId);
         messages.at(rank).set_mpirank(rank);
@@ -110,12 +118,28 @@ TEST_CASE_METHOD(MpiBaseTestFixture,
     for (const auto& id : sch.getChainedFunctions(msg.id())) {
         sch.getFunctionResult(id, 500);
     }
+    ExecGraph actual = sch.getFunctionExecGraph(msg.id());
+
+    // Unset the fields that we can't recreate
+    actual.rootNode.msg.set_id(0);
+    actual.rootNode.msg.set_finishtimestamp(0);
+    actual.rootNode.msg.set_timestamp(0);
+    actual.rootNode.msg.set_resultkey("");
+    actual.rootNode.msg.set_statuskey("");
+    actual.rootNode.msg.set_outputdata("");
+    for (auto& node : actual.rootNode.children) {
+        node.msg.set_id(0);
+        node.msg.set_finishtimestamp(0);
+        node.msg.set_timestamp(0);
+        node.msg.set_resultkey("");
+        node.msg.set_statuskey("");
+        node.msg.set_outputdata("");
+    }
 
     // Check the execution graph
-    ExecGraph actual = sch.getFunctionExecGraph(msg.id());
     REQUIRE(countExecGraphNodes(actual) == worldSize);
     REQUIRE(countExecGraphNodes(expected) == worldSize);
 
-    checkExecGraphEquality(expected, actual, true);
+    checkExecGraphEquality(expected, actual);
 }
 }
diff --git a/tests/utils/exec_graph_utils.cpp b/tests/utils/exec_graph_utils.cpp
@@ -6,15 +6,10 @@
 
 namespace tests {
 void checkExecGraphNodeEquality(const scheduler::ExecGraphNode& nodeA,
-                                const scheduler::ExecGraphNode& nodeB,
-                                bool isMpi)
+                                const scheduler::ExecGraphNode& nodeB)
 {
     // Check the message itself
-    if (isMpi) {
-        checkMpiMessageEquivalence(nodeA.msg, nodeB.msg);
-    } else {
-        checkMessageEquality(nodeA.msg, nodeB.msg);
-    }
+    checkMessageEquality(nodeA.msg, nodeB.msg);
 
     if (nodeA.children.size() != nodeB.children.size()) {
         FAIL(fmt::format("Children not same size: {} vs {}",
@@ -24,15 +19,13 @@ void checkExecGraphNodeEquality(const scheduler::ExecGraphNode& nodeA,
 
     // Assume children are in same order
     for (int i = 0; i < nodeA.children.size(); i++) {
-        checkExecGraphNodeEquality(
-          nodeA.children.at(i), nodeB.children.at(i), isMpi);
+        checkExecGraphNodeEquality(nodeA.children.at(i), nodeB.children.at(i));
     }
 }
 
 void checkExecGraphEquality(const scheduler::ExecGraph& graphA,
-                            const scheduler::ExecGraph& graphB,
-                            bool isMpi)
+                            const scheduler::ExecGraph& graphB)
 {
-    checkExecGraphNodeEquality(graphA.rootNode, graphB.rootNode, isMpi);
+    checkExecGraphNodeEquality(graphA.rootNode, graphB.rootNode);
 }
 }
diff --git a/tests/utils/faabric_utils.h b/tests/utils/faabric_utils.h
@@ -65,16 +65,11 @@ void cleanFaabric();
 void checkMessageEquality(const faabric::Message& msgA,
                           const faabric::Message& msgB);
 
-void checkMpiMessageEquivalence(const faabric::Message& msgA,
-                                const faabric::Message& msgB);
-
 void checkExecGraphNodeEquality(const scheduler::ExecGraphNode& nodeA,
-                                const scheduler::ExecGraphNode& nodeB,
-                                bool isMpi = false);
+                                const scheduler::ExecGraphNode& nodeB);
 
 void checkExecGraphEquality(const scheduler::ExecGraph& graphA,
-                            const scheduler::ExecGraph& graphB,
-                            bool isMpi = false);
+                            const scheduler::ExecGraph& graphB);
 
 std::pair<int, std::string> submitGetRequestToUrl(const std::string& host,
                                                   int port,

diff --git a/tests/utils/message_utils.cpp b/tests/utils/message_utils.cpp
@@ -48,16 +48,4 @@ void checkMessageEquality(const faabric::Message& msgA,
     REQUIRE(msgA.sgxpolicy() == msgB.sgxpolicy());
     REQUIRE(msgA.sgxresult() == msgB.sgxresult());
 }
-
-void checkMpiMessageEquivalence(const faabric::Message& msgA,
-                                const faabric::Message& msgB)
-{
-    REQUIRE(msgA.user() == msgB.user());
-    REQUIRE(msgA.function() == msgB.function());
-
-    REQUIRE(msgA.ismpi() == msgB.ismpi());
-    REQUIRE(msgA.mpiworldid() == msgB.mpiworldid());
-    REQUIRE(msgA.mpirank() == msgB.mpirank());
-    REQUIRE(msgA.mpiworldsize() == msgB.mpiworldsize());
-}
 }