From 31de74d9f274c26faf6e54fc412a901ba1c8b1b2 Mon Sep 17 00:00:00 2001 From: Liuqu Date: Tue, 13 Mar 2018 17:33:07 +0800 Subject: [PATCH] Fix testdata file name invalid in windows OS --- dialout/dialout_client/dialout_client_test.go | 12 ++++----- gnmi_server/server_test.go | 26 +++++++++---------- ...S:Ethernet1.txt => COUNTERS_Ethernet1.txt} | 0 ...Ethernet68.txt => COUNTERS_Ethernet68.txt} | 0 ...ues.txt => COUNTERS_Ethernet68_Queues.txt} | 0 ...t => COUNTERS_Ethernet68_Queues_alias.txt} | 0 ...ard.txt => COUNTERS_Ethernet_wildcard.txt} | 0 ...> COUNTERS_Ethernet_wildcard_PFC_7_RX.txt} | 0 ...TERS_Ethernet_wildcard_PFC_7_RX_alias.txt} | 0 ... => COUNTERS_Ethernet_wildcard_Queues.txt} | 0 ...UNTERS_Ethernet_wildcard_Queues_alias.txt} | 0 ...t => COUNTERS_Ethernet_wildcard_alias.txt} | 0 ....txt => COUNTERS_oid_0x1500000000091c.txt} | 0 ....txt => COUNTERS_oid_0x1500000000092a.txt} | 0 14 files changed, 19 insertions(+), 19 deletions(-) rename testdata/{COUNTERS:Ethernet1.txt => COUNTERS_Ethernet1.txt} (100%) rename testdata/{COUNTERS:Ethernet68.txt => COUNTERS_Ethernet68.txt} (100%) rename testdata/{COUNTERS:Ethernet68:Queues.txt => COUNTERS_Ethernet68_Queues.txt} (100%) rename testdata/{COUNTERS:Ethernet68:Queues_alias.txt => COUNTERS_Ethernet68_Queues_alias.txt} (100%) rename testdata/{COUNTERS:Ethernet_wildcard.txt => COUNTERS_Ethernet_wildcard.txt} (100%) rename testdata/{COUNTERS:Ethernet_wildcard_PFC_7_RX.txt => COUNTERS_Ethernet_wildcard_PFC_7_RX.txt} (100%) rename testdata/{COUNTERS:Ethernet_wildcard_PFC_7_RX_alias.txt => COUNTERS_Ethernet_wildcard_PFC_7_RX_alias.txt} (100%) rename testdata/{COUNTERS:Ethernet_wildcard_Queues.txt => COUNTERS_Ethernet_wildcard_Queues.txt} (100%) rename testdata/{COUNTERS:Ethernet_wildcard_Queues_alias.txt => COUNTERS_Ethernet_wildcard_Queues_alias.txt} (100%) rename testdata/{COUNTERS:Ethernet_wildcard_alias.txt => COUNTERS_Ethernet_wildcard_alias.txt} (100%) rename testdata/{COUNTERS:oid:0x1500000000091c.txt => COUNTERS_oid_0x1500000000091c.txt} (100%) rename testdata/{COUNTERS:oid:0x1500000000092a.txt => COUNTERS_oid_0x1500000000092a.txt} (100%) diff --git a/dialout/dialout_client/dialout_client_test.go b/dialout/dialout_client/dialout_client_test.go index 22c857b57..385d634ca 100644 --- a/dialout/dialout_client/dialout_client_test.go +++ b/dialout/dialout_client/dialout_client_test.go @@ -188,7 +188,7 @@ func prepareDb(t *testing.T) { mpi_name_map := loadConfig(t, "COUNTERS_PORT_NAME_MAP", countersPortNameMapByte) loadDB(t, rclient, mpi_name_map) - fileName = "../../testdata/COUNTERS:Ethernet68.txt" + fileName = "../../testdata/COUNTERS_Ethernet68.txt" countersEthernet68Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -197,7 +197,7 @@ func prepareDb(t *testing.T) { mpi_counter := loadConfig(t, "COUNTERS:oid:0x1000000000039", countersEthernet68Byte) loadDB(t, rclient, mpi_counter) - fileName = "../../testdata/COUNTERS:Ethernet1.txt" + fileName = "../../testdata/COUNTERS_Ethernet1.txt" countersEthernet1Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -207,7 +207,7 @@ func prepareDb(t *testing.T) { loadDB(t, rclient, mpi_counter) // "Ethernet64:0": "oid:0x1500000000092a" : queue counter, to work as data noise - fileName = "../../testdata/COUNTERS:oid:0x1500000000092a.txt" + fileName = "../../testdata/COUNTERS_oid_0x1500000000092a.txt" counters92aByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -312,14 +312,14 @@ func TestGNMIDialOutPublish(t *testing.T) { } _ = countersPortNameMapByte - fileName = "../../testdata/COUNTERS:Ethernet68.txt" + fileName = "../../testdata/COUNTERS_Ethernet68.txt" countersEthernet68Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) } _ = countersEthernet68Byte - fileName = "../../testdata/COUNTERS:Ethernet_wildcard_alias.txt" + fileName = "../../testdata/COUNTERS_Ethernet_wildcard_alias.txt" countersEthernetWildcardByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -327,7 +327,7 @@ func TestGNMIDialOutPublish(t *testing.T) { _ = countersEthernetWildcardByte - fileName = "../../testdata/COUNTERS:Ethernet_wildcard_PFC_7_RX_alias.txt" + fileName = "../../testdata/COUNTERS_Ethernet_wildcard_PFC_7_RX_alias.txt" countersEthernetWildcardPfcByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) diff --git a/gnmi_server/server_test.go b/gnmi_server/server_test.go index 8858a2efc..079f4e924 100644 --- a/gnmi_server/server_test.go +++ b/gnmi_server/server_test.go @@ -242,7 +242,7 @@ func prepareDb(t *testing.T) { mpi_qname_map := loadConfig(t, "COUNTERS_QUEUE_NAME_MAP", countersQueueNameMapByte) loadDB(t, rclient, mpi_qname_map) - fileName = "../testdata/COUNTERS:Ethernet68.txt" + fileName = "../testdata/COUNTERS_Ethernet68.txt" countersEthernet68Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -251,7 +251,7 @@ func prepareDb(t *testing.T) { mpi_counter := loadConfig(t, "COUNTERS:oid:0x1000000000039", countersEthernet68Byte) loadDB(t, rclient, mpi_counter) - fileName = "../testdata/COUNTERS:Ethernet1.txt" + fileName = "../testdata/COUNTERS_Ethernet1.txt" countersEthernet1Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -261,7 +261,7 @@ func prepareDb(t *testing.T) { loadDB(t, rclient, mpi_counter) // "Ethernet64:0": "oid:0x1500000000092a" : queue counter, to work as data noise - fileName = "../testdata/COUNTERS:oid:0x1500000000092a.txt" + fileName = "../testdata/COUNTERS_oid_0x1500000000092a.txt" counters92aByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -270,7 +270,7 @@ func prepareDb(t *testing.T) { loadDB(t, rclient, mpi_counter) // "Ethernet68:1": "oid:0x1500000000091c" : queue counter, for COUNTERS/Ethernet68/Queue vpath test - fileName = "../testdata/COUNTERS:oid:0x1500000000091c.txt" + fileName = "../testdata/COUNTERS_oid_0x1500000000091c.txt" countersEeth68_1Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -311,19 +311,19 @@ func TestGnmiGet(t *testing.T) { t.Fatalf("read file %v err: %v", fileName, err) } - fileName = "../testdata/COUNTERS:Ethernet68.txt" + fileName = "../testdata/COUNTERS_Ethernet68.txt" countersEthernet68Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) } - fileName = "../testdata/COUNTERS:Ethernet_wildcard_alias.txt" + fileName = "../testdata/COUNTERS_Ethernet_wildcard_alias.txt" countersEthernetWildcardByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) } - fileName = "../testdata/COUNTERS:Ethernet_wildcard_PFC_7_RX_alias.txt" + fileName = "../testdata/COUNTERS_Ethernet_wildcard_PFC_7_RX_alias.txt" countersEthernetWildcardPfcByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -457,7 +457,7 @@ func runTestSubscribe(t *testing.T) { countersPortNameMapJsonUpdate["test_field"] = "test_value" // for table key subscription - fileName = "../testdata/COUNTERS:Ethernet68.txt" + fileName = "../testdata/COUNTERS_Ethernet68.txt" countersEthernet68Byte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -476,7 +476,7 @@ func runTestSubscribe(t *testing.T) { // field SAI_PORT_STAT_PFC_7_RX_PKTS has new value of 4 countersEthernet68JsonPfcUpdate["SAI_PORT_STAT_PFC_7_RX_PKTS"] = "4" - fileName = "../testdata/COUNTERS:Ethernet_wildcard_alias.txt" + fileName = "../testdata/COUNTERS_Ethernet_wildcard_alias.txt" countersEthernetWildcardByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -491,7 +491,7 @@ func runTestSubscribe(t *testing.T) { json.Unmarshal(countersEthernetWildcardByte, &countersFieldUpdate) countersFieldUpdate["Ethernet68/1"] = countersEthernet68JsonPfcUpdate - fileName = "../testdata/COUNTERS:Ethernet_wildcard_PFC_7_RX_alias.txt" + fileName = "../testdata/COUNTERS_Ethernet_wildcard_PFC_7_RX_alias.txt" countersEthernetWildcardPfcByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -508,7 +508,7 @@ func runTestSubscribe(t *testing.T) { //allPortPfcJsonUpdate := countersEthernetWildcardPfcJson.(map[string]interface{}) allPortPfcJsonUpdate["Ethernet68/1"] = pfc7Map - fileName = "../testdata/COUNTERS:Ethernet_wildcard_Queues_alias.txt" + fileName = "../testdata/COUNTERS_Ethernet_wildcard_Queues_alias.txt" countersEthernetWildQueuesByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -516,7 +516,7 @@ func runTestSubscribe(t *testing.T) { var countersEthernetWildQueuesJson interface{} json.Unmarshal(countersEthernetWildQueuesByte, &countersEthernetWildQueuesJson) - fileName = "../testdata/COUNTERS:Ethernet68:Queues.txt" + fileName = "../testdata/COUNTERS_Ethernet68_Queues.txt" countersEthernet68QueuesByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) @@ -535,7 +535,7 @@ func runTestSubscribe(t *testing.T) { countersEthernet68QueuesJsonUpdate["Ethernet68:1"] = eth68_1 // Alias translation for query Ethernet68/1:Queues - fileName = "../testdata/COUNTERS:Ethernet68:Queues_alias.txt" + fileName = "../testdata/COUNTERS_Ethernet68_Queues_alias.txt" countersEthernet68QueuesAliasByte, err := ioutil.ReadFile(fileName) if err != nil { t.Fatalf("read file %v err: %v", fileName, err) diff --git a/testdata/COUNTERS:Ethernet1.txt b/testdata/COUNTERS_Ethernet1.txt similarity index 100% rename from testdata/COUNTERS:Ethernet1.txt rename to testdata/COUNTERS_Ethernet1.txt diff --git a/testdata/COUNTERS:Ethernet68.txt b/testdata/COUNTERS_Ethernet68.txt similarity index 100% rename from testdata/COUNTERS:Ethernet68.txt rename to testdata/COUNTERS_Ethernet68.txt diff --git a/testdata/COUNTERS:Ethernet68:Queues.txt b/testdata/COUNTERS_Ethernet68_Queues.txt similarity index 100% rename from testdata/COUNTERS:Ethernet68:Queues.txt rename to testdata/COUNTERS_Ethernet68_Queues.txt diff --git a/testdata/COUNTERS:Ethernet68:Queues_alias.txt b/testdata/COUNTERS_Ethernet68_Queues_alias.txt similarity index 100% rename from testdata/COUNTERS:Ethernet68:Queues_alias.txt rename to testdata/COUNTERS_Ethernet68_Queues_alias.txt diff --git a/testdata/COUNTERS:Ethernet_wildcard.txt b/testdata/COUNTERS_Ethernet_wildcard.txt similarity index 100% rename from testdata/COUNTERS:Ethernet_wildcard.txt rename to testdata/COUNTERS_Ethernet_wildcard.txt diff --git a/testdata/COUNTERS:Ethernet_wildcard_PFC_7_RX.txt b/testdata/COUNTERS_Ethernet_wildcard_PFC_7_RX.txt similarity index 100% rename from testdata/COUNTERS:Ethernet_wildcard_PFC_7_RX.txt rename to testdata/COUNTERS_Ethernet_wildcard_PFC_7_RX.txt diff --git a/testdata/COUNTERS:Ethernet_wildcard_PFC_7_RX_alias.txt b/testdata/COUNTERS_Ethernet_wildcard_PFC_7_RX_alias.txt similarity index 100% rename from testdata/COUNTERS:Ethernet_wildcard_PFC_7_RX_alias.txt rename to testdata/COUNTERS_Ethernet_wildcard_PFC_7_RX_alias.txt diff --git a/testdata/COUNTERS:Ethernet_wildcard_Queues.txt b/testdata/COUNTERS_Ethernet_wildcard_Queues.txt similarity index 100% rename from testdata/COUNTERS:Ethernet_wildcard_Queues.txt rename to testdata/COUNTERS_Ethernet_wildcard_Queues.txt diff --git a/testdata/COUNTERS:Ethernet_wildcard_Queues_alias.txt b/testdata/COUNTERS_Ethernet_wildcard_Queues_alias.txt similarity index 100% rename from testdata/COUNTERS:Ethernet_wildcard_Queues_alias.txt rename to testdata/COUNTERS_Ethernet_wildcard_Queues_alias.txt diff --git a/testdata/COUNTERS:Ethernet_wildcard_alias.txt b/testdata/COUNTERS_Ethernet_wildcard_alias.txt similarity index 100% rename from testdata/COUNTERS:Ethernet_wildcard_alias.txt rename to testdata/COUNTERS_Ethernet_wildcard_alias.txt diff --git a/testdata/COUNTERS:oid:0x1500000000091c.txt b/testdata/COUNTERS_oid_0x1500000000091c.txt similarity index 100% rename from testdata/COUNTERS:oid:0x1500000000091c.txt rename to testdata/COUNTERS_oid_0x1500000000091c.txt diff --git a/testdata/COUNTERS:oid:0x1500000000092a.txt b/testdata/COUNTERS_oid_0x1500000000092a.txt similarity index 100% rename from testdata/COUNTERS:oid:0x1500000000092a.txt rename to testdata/COUNTERS_oid_0x1500000000092a.txt