From 319f38b65c75eacfffae4888181f11f6ab78527b Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Mon, 19 Mar 2012 14:04:17 -0700 Subject: [PATCH] Cherry-pick sort order fixes from DS-110 --- test/gizzmo_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/gizzmo_spec.rb b/test/gizzmo_spec.rb index 0b27280..cdded0f 100644 --- a/test/gizzmo_spec.rb +++ b/test/gizzmo_spec.rb @@ -193,7 +193,7 @@ def nameserver_db describe "subtree" do it "prints the tree for a shard" do - results = "localhost/t_0_000_replicating\n 127.0.0.1/t_0_000_b\n localhost/t_0_000_a\n" + results = "localhost/t_0_000_replicating\n localhost/t_0_000_a\n 127.0.0.1/t_0_000_b\n" gizzmo("subtree localhost/t_0_000_replicating").should == results gizzmo("subtree localhost/t_0_000_a").should == results gizzmo("subtree 127.0.0.1/t_0_000_b").should == results @@ -721,12 +721,12 @@ def nameserver_db link(id("localhost", "s_1_0003_replicating"), id("127.0.0.1", "s_1_0003"), 1)] nameserver_db[:forwardings].should == [forwarding(0, 0, id("localhost", "s_0_0000_replicating")), - forwarding(1, 0, id("localhost", "s_1_0000_replicating")), forwarding(0, 288230376151711744, id("localhost", "s_0_0003_replicating")), - forwarding(1, 288230376151711744, id("localhost", "s_1_0003_replicating")), forwarding(0, 576460752303423488, id("localhost", "s_0_0002_replicating")), - forwarding(1, 576460752303423488, id("localhost", "s_1_0002_replicating")), forwarding(0, 864691128455135232, id("localhost", "s_0_0001_replicating")), + forwarding(1, 0, id("localhost", "s_1_0000_replicating")), + forwarding(1, 288230376151711744, id("localhost", "s_1_0003_replicating")), + forwarding(1, 576460752303423488, id("localhost", "s_1_0002_replicating")), forwarding(1, 864691128455135232, id("localhost", "s_1_0001_replicating"))] end