Reenable IC tests

Fix IC tests flakiness and reenable them. Change-Id: Ia11ada0a24fd984126a6471fa87d644351b37dc2 Partial-bug: #1794332
Juniper · Oct 17, 2018 · 0306a26 · 0306a26
1 parent e99d8ad
commit 0306a26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/pkg/compilation/service_test.go b/pkg/compilation/service_test.go
@@ -34,7 +34,6 @@ func setTestConfig() {
 }
 
 func TestIntentCompilationServiceHandlesMessage(t *testing.T) {
-	t.Skip("temporary skipping test.")
 	etcdClient := integrationetcd.NewEtcdClient(t)
 	_, err := etcdClient.Delete(context.Background(), testMessageIndexString)
 	assert.NoError(t, err)
@@ -74,7 +73,6 @@ func TestIntentCompilationServiceHandlesMessage(t *testing.T) {
 }
 
 func TestIntentCompilationServiceConcurrency(t *testing.T) {
-	t.Skip("temporary skipping test.")
 	etcdClient := integrationetcd.NewEtcdClient(t)
 	_, err := etcdClient.Delete(context.Background(), testMessageIndexString)
 	assert.NoError(t, err)
@@ -219,7 +217,7 @@ type blockingStore struct {
 
 func newBlockingStore() *blockingStore {
 	b := &blockingStore{
-		StartedWatch:          make(chan struct{}),
+		StartedWatch:          make(chan struct{}, 1),
 		StartPut:              make(chan struct{}, 1),
 		FinishedPut:           make(chan string, 1),
 		StartGet:              make(chan struct{}, 1),
@@ -253,7 +251,7 @@ func (s *blockingStore) WatchRecursive(
 	ctx context.Context, keyPattern string, afterIndex int64,
 ) chan etcd.Message {
 	c := s.Store.WatchRecursive(ctx, keyPattern, afterIndex)
-	close(s.StartedWatch)
+	s.StartedWatch <- struct{}{}
 	return c
 }
 

diff --git a/pkg/services/event_test.go b/pkg/services/event_test.go
@@ -23,16 +23,16 @@ func TestCreateEventJSONEncoding(t *testing.T) {
 		},
 	}
 	m, err := json.Marshal(e)
-	assert.NoError(t, err, "marhsal event failed")
+	assert.NoError(t, err, "marshal event failed")
 	var i map[string]interface{}
 	err = json.Unmarshal(m, &i)
-	assert.NoError(t, err, "unmarhsal event failed")
+	assert.NoError(t, err, "unmarshal event failed")
 	assert.Equal(t, "virtual_network", i["kind"])
 	assert.Equal(t, "CREATE", i["operation"])
 
 	var d Event
 	err = json.Unmarshal(m, &d)
-	assert.NoError(t, err, "unmarhsal event failed")
+	assert.NoError(t, err, "unmarshal event failed")
 	request := d.GetCreateVirtualNetworkRequest()
 	assert.Equal(t, "vn_uuid", request.GetVirtualNetwork().GetUUID())
 
@@ -56,24 +56,23 @@ func TestDeleteEventJSONEncoding(t *testing.T) {
 		},
 	}
 	m, err := json.Marshal(e)
-	assert.NoError(t, err, "marhsal event failed")
+	assert.NoError(t, err, "marshal event failed")
 	fmt.Println(string(m))
 	var i map[string]interface{}
 	err = json.Unmarshal(m, &i)
-	assert.NoError(t, err, "unmarhsal event failed")
+	assert.NoError(t, err, "unmarshal event failed")
 	assert.Equal(t, "virtual_network", i["kind"])
 	assert.Equal(t, "DELETE", i["operation"])
 	assert.Equal(t, "vn_uuid", i["data"].(map[string]interface{})["uuid"])
 
 	var d Event
 	err = json.Unmarshal(m, &d)
-	assert.NoError(t, err, "unmarhsal event failed")
+	assert.NoError(t, err, "unmarshal event failed")
 	request := d.GetDeleteVirtualNetworkRequest()
 	assert.Equal(t, "vn_uuid", request.ID)
 }
 
 func TestCreateEventYAMLEncoding(t *testing.T) {
-	t.Skip("TODO: Fix me")
 	e := &Event{
 		Request: &Event_CreateVirtualNetworkRequest{
 			CreateVirtualNetworkRequest: &CreateVirtualNetworkRequest{
@@ -85,23 +84,24 @@ func TestCreateEventYAMLEncoding(t *testing.T) {
 	}
 	m, err := yaml.Marshal(e)
 	fmt.Println(string(m))
-	assert.NoError(t, err, "marhsal event failed")
+	assert.NoError(t, err, "marshal event failed")
+
 	var i map[string]interface{}
 	err = yaml.Unmarshal(m, &i)
-	assert.NoError(t, err, "unmarhsal event failed")
+	assert.NoError(t, err, "unmarshal event failed")
 	assert.Equal(t, "virtual_network", i["kind"])
 	assert.Equal(t, "CREATE", i["operation"])
 
 	var d Event
 	err = yaml.Unmarshal(m, &d)
-	assert.NoError(t, err, "unmarhsal event failed")
+	assert.NoError(t, err, "unmarshal event failed")
 	request := d.GetCreateVirtualNetworkRequest()
 	assert.Equal(t, "vn_uuid", request.GetVirtualNetwork().GetUUID())
 	i = common.YAMLtoJSONCompat(i).(map[string]interface{}) //nolint: errcheck
 	d2, err := NewEvent(&EventOption{
 		Kind:      i["kind"].(string),
 		Operation: i["operation"].(string),
-		Data:      i["data"].(map[string]interface{}),
+		Data:      common.YAMLtoJSONCompat(i["data"]).(map[string]interface{}),
 	})
 	if assert.NoError(t, err) {
 		request = d2.GetCreateVirtualNetworkRequest()