Skip to content
This repository has been archived by the owner on Aug 31, 2022. It is now read-only.

Fix testdata file name invalid in windows OS #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix testdata file name invalid in windows OS #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dialout/dialout_client/dialout_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -312,22 +312,22 @@ 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)
}

_ = 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)
Expand Down
26 changes: 13 additions & 13 deletions gnmi_server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -508,15 +508,15 @@ 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)
}
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)
Expand All @@ -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)
Expand Down
0 testdata/COUNTERS:Ethernet1.txt → testdata/COUNTERS_Ethernet1.txt
View file
Open in desktop
File renamed without changes.
0 testdata/COUNTERS:Ethernet68.txt → testdata/COUNTERS_Ethernet68.txt
View file
Open in desktop
File renamed without changes.
0 testdata/COUNTERS:Ethernet68:Queues.txt → testdata/COUNTERS_Ethernet68_Queues.txt
View file
Open in desktop
File renamed without changes.
0 ...data/COUNTERS:Ethernet68:Queues_alias.txt → ...data/COUNTERS_Ethernet68_Queues_alias.txt
View file
Open in desktop
File renamed without changes.
0 testdata/COUNTERS:Ethernet_wildcard.txt → testdata/COUNTERS_Ethernet_wildcard.txt
View file
Open in desktop
File renamed without changes.
0 ...a/COUNTERS:Ethernet_wildcard_PFC_7_RX.txt → ...a/COUNTERS_Ethernet_wildcard_PFC_7_RX.txt
View file
Open in desktop
File renamed without changes.
0 ...TERS:Ethernet_wildcard_PFC_7_RX_alias.txt → ...TERS_Ethernet_wildcard_PFC_7_RX_alias.txt
View file
Open in desktop
File renamed without changes.
0 ...ata/COUNTERS:Ethernet_wildcard_Queues.txt → ...ata/COUNTERS_Ethernet_wildcard_Queues.txt
View file
Open in desktop
File renamed without changes.
0 ...UNTERS:Ethernet_wildcard_Queues_alias.txt → ...UNTERS_Ethernet_wildcard_Queues_alias.txt
View file
Open in desktop
File renamed without changes.
0 ...data/COUNTERS:Ethernet_wildcard_alias.txt → ...data/COUNTERS_Ethernet_wildcard_alias.txt
View file
Open in desktop
File renamed without changes.
0 testdata/COUNTERS:oid:0x1500000000091c.txt → testdata/COUNTERS_oid_0x1500000000091c.txt
View file
Open in desktop
File renamed without changes.
0 testdata/COUNTERS:oid:0x1500000000092a.txt → testdata/COUNTERS_oid_0x1500000000092a.txt
View file
Open in desktop
File renamed without changes.