From ab52a518bfae947fd4e4155cc6ad7416398b9445 Mon Sep 17 00:00:00 2001 From: William Chargin Date: Tue, 14 Apr 2020 11:02:01 -0700 Subject: [PATCH 1/2] uploader_test: check logical equality of protos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Fixes an oversight in #3507: we can’t assert that the raw bytes are what was expected because the code under test does a proto serialization roundtrip, which is permitted to permute keys. Test Plan: Tests still pass, and this should fix an internal sync error. wchargin-branch: uploader-test-proto-equal --- tensorboard/uploader/uploader_test.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tensorboard/uploader/uploader_test.py b/tensorboard/uploader/uploader_test.py index f7bb34351d..d089f9a613 100644 --- a/tensorboard/uploader/uploader_test.py +++ b/tensorboard/uploader/uploader_test.py @@ -288,6 +288,9 @@ def test_start_uploading_graphs(self): graph_event = event_pb2.Event( graph_def=_create_example_graph_bytes(950) ) + expected_graph_def = graph_pb2.GraphDef.FromString( + graph_event.graph_def + ) mock_logdir_loader = mock.create_autospec(logdir_loader.LogdirLoader) mock_logdir_loader.get_run_events.side_effect = [ { @@ -311,7 +314,8 @@ def test_start_uploading_graphs(self): for (i, call) in enumerate(mock_client.WriteBlob.call_args_list): requests = list(call[0][0]) data = b"".join(r.data for r in requests) - self.assertEqual(data, graph_event.graph_def) + actual_graph_def = graph_pb2.GraphDef.FromString(data) + self.assertEqual(actual_graph_def, expected_graph_def) self.assertEqual( set(r.blob_sequence_id for r in requests), {"blob%d" % i}, ) From 6b1089065bbde0d32bc1fb215b71d9fa1bd3d6be Mon Sep 17 00:00:00 2001 From: William Chargin Date: Tue, 14 Apr 2020 11:36:13 -0700 Subject: [PATCH 2/2] [update patch] wchargin-branch: uploader-test-proto-equal wchargin-source: 04ec53b1e69857650afdf5437e5e035f8d671623 --- tensorboard/uploader/uploader_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorboard/uploader/uploader_test.py b/tensorboard/uploader/uploader_test.py index d089f9a613..b14fbb6e65 100644 --- a/tensorboard/uploader/uploader_test.py +++ b/tensorboard/uploader/uploader_test.py @@ -315,7 +315,7 @@ def test_start_uploading_graphs(self): requests = list(call[0][0]) data = b"".join(r.data for r in requests) actual_graph_def = graph_pb2.GraphDef.FromString(data) - self.assertEqual(actual_graph_def, expected_graph_def) + self.assertProtoEquals(expected_graph_def, actual_graph_def) self.assertEqual( set(r.blob_sequence_id for r in requests), {"blob%d" % i}, )