From 6879581891409115ff51736df7117a292a2deec5 Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Wed, 26 Feb 2020 09:44:42 -0500 Subject: [PATCH] controlclient: adjust user expiry test Signed-off-by: David Crawshaw --- control/controlclient/auto_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/control/controlclient/auto_test.go b/control/controlclient/auto_test.go index 51f5149a3..4f578060b 100644 --- a/control/controlclient/auto_test.go +++ b/control/controlclient/auto_test.go @@ -741,16 +741,15 @@ func TestNewUserWebFlow(t *testing.T) { if len(peers) != 1 { t.Errorf("len(peers)=%d, want 1", len(peers)) } + var nodeExp time.Time if nodes, err := s.control.DB().AllNodes(netmap.User); err != nil { t.Fatal(err) } else if len(nodes) != 1 { t.Errorf("len(nodes)=%d, want 1", len(nodes)) - } else if exp := nodes[0].KeyExpiry; exp.After(c.timeNow()) { - t.Errorf("node[0] expiry=%v, want it to have passed", exp) - } - netmap := c.status(t).New.NetMap - if exp := netmap.Expiry; exp.After(c.timeNow()) { - t.Errorf("expiry=%v, want it to have passed", exp) + } else if nodeExp = nodes[0].KeyExpiry; c.timeNow().Sub(nodeExp) > 24*time.Hour { + t.Errorf("node[0] expiry=%v, want it to be in less than a day", nodeExp) + } else if got := c.status(t).New.NetMap.Expiry; !got.Equal(nodeExp) { + t.Errorf("expiry=%v, want it to be %v", got, nodeExp) } }) }