From fca0df59fbc1f225af68ead44ed5aa2dba735670 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Mon, 23 Oct 2017 10:08:34 +0200 Subject: [PATCH] Revert "agent: skip non-sensical TestCatalogRegister" This reverts commit ce1f35373e6ad1486cb83398fce70f5c54f910d3. --- agent/catalog_endpoint_test.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/agent/catalog_endpoint_test.go b/agent/catalog_endpoint_test.go index fa73dbeee8..566ba62013 100644 --- a/agent/catalog_endpoint_test.go +++ b/agent/catalog_endpoint_test.go @@ -13,8 +13,6 @@ import ( ) func TestCatalogRegister(t *testing.T) { - t.Skip("skipping since it is not clear what this test is supposed to verify") - t.Parallel() a := NewTestAgent(t.Name(), "") defer a.Shutdown() @@ -29,11 +27,28 @@ func TestCatalogRegister(t *testing.T) { if err != nil { t.Fatalf("err: %v", err) } + res := obj.(bool) if res != true { t.Fatalf("bad: %v", res) } + // todo(fs): data race + // func() { + // a.State.Lock() + // defer a.State.Unlock() + + // // Service should be in sync + // if err := a.State.syncService("foo"); err != nil { + // t.Fatalf("err: %s", err) + // } + // if _, ok := a.State.serviceStatus["foo"]; !ok { + // t.Fatalf("bad: %#v", a.State.serviceStatus) + // } + // if !a.State.serviceStatus["foo"].inSync { + // t.Fatalf("should be in sync") + // } + // }() if err := a.State.SyncChanges(); err != nil { t.Fatal("sync failed: ", err) }