Skip to content

Commit

Permalink
fix: Fix tests that are failing because of the rename
Browse files Browse the repository at this point in the history 
These tests were part of a PR when the rename was made.
The changes were not rebased before merge so we did not discover the
failures till after the merge.
  • Loading branch information
@nathanielc
nathanielc committed Jul 13, 2018
1 parent 92d262d commit cdb915b
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions functions/difference_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,15 @@ func TestDifference_Process(t *testing.T) {
Columns: []string{"x", "y"},
NonNegative: true,
},
data: []query.Block{&executetest.Block{
data: []query.Table{&executetest.Table{
ColMeta: []query.ColMeta{
{Label: "_time", Type: query.TTime},
{Label: "x", Type: query.TFloat},
{Label: "y", Type: query.TFloat},
},
Data: [][]interface{}{},
}},
want: []*executetest.Block{{
want: []*executetest.Table{{
ColMeta: []query.ColMeta{
{Label: "_time", Type: query.TTime},
{Label: "x", Type: query.TFloat},
Expand All @@ -336,7 +336,7 @@ func TestDifference_Process(t *testing.T) {
Columns: []string{"x", "y"},
NonNegative: true,
},
data: []query.Block{&executetest.Block{
data: []query.Table{&executetest.Table{
ColMeta: []query.ColMeta{
{Label: "_time", Type: query.TTime},
{Label: "x", Type: query.TFloat},
Expand All @@ -346,7 +346,7 @@ func TestDifference_Process(t *testing.T) {
{execute.Time(3), 10.0, 20.0},
},
}},
want: []*executetest.Block{{
want: []*executetest.Table{{
ColMeta: []query.ColMeta{
{Label: "_time", Type: query.TTime},
{Label: "x", Type: query.TFloat},
Expand Down
4 changes: 2 additions & 2 deletions functions/testdata/difference.in.csv
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true,true,true
#default,_result,,,,,,,,,,,
,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,34.98234271799806,used_percent,disk,disk1s1,apfs,host.local,/
,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,34.98234941084654,used_percent,disk,disk1s1,apfs,host.local,/
,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:46Z,34.982447293755506,used_percent,disk,disk1s1,apfs,host.local,/
,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:56Z,34.982447293755506,used_percent,disk,disk1s1,apfs,host.local,/
,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,34.98204153981662,used_percent,disk,disk1s1,apfs,host.local,/
,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,34.982252364543626,used_percent,disk,disk1s1,apfs,host.local,/
,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,34.982252364543626,used_percent,disk,disk1s1,apfs,host.local,/
2 changes: 1 addition & 1 deletion functions/testdata/difference.out.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true,true,true
#default,_result,,,,,,,,,,,
,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0.000006692848479872282,used_percent,disk,disk1s1,apfs,host.local,/
Expand Down
4 changes: 2 additions & 2 deletions functions/testdata/difference_one_value.in.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true
#default,_result,,,,,,,,,
,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,1,usage_guest,cpu,cpu-total,host.local
,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,1,usage_guest,cpu,cpu-total,host.local
2 changes: 1 addition & 1 deletion functions/testdata/difference_one_value.out.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true
#default,_result,0,,,,,usage_guest,cpu,cpu-total,host.local
,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host

4 changes: 2 additions & 2 deletions functions/testdata/difference_panic.out.csv
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true
#default,_result,0,,,,,usage_guest,cpu,cpu-total,host.local
,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host

#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true
#default,_result,1,,,,,usage_guest_nice,cpu,cpu-total,host.local
,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host

4 changes: 2 additions & 2 deletions functions/testdata/meta_query_fields.in.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true
#default,_result,,,,,,,,,
,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_guest,cpu,cpu-total,host.local
Expand Down Expand Up @@ -27,4 +27,4 @@
,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,0,usage_iowait,cpu,cpu-total,host.local
,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,0,usage_iowait,cpu,cpu-total,host.local
,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_irq,cpu,cpu-total,host.local
,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
2 changes: 1 addition & 1 deletion functions/testdata/meta_query_fields.out.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,string,string
#partition,false,false,false,false
#group,false,false,false,false
#default,_result,,,
,result,table,_field,_value
,,0,usage_guest,usage_guest
Expand Down
4 changes: 2 additions & 2 deletions functions/testdata/meta_query_keys.in.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true
#default,_result,,,,,,,,,
,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_guest,cpu,cpu-total,host.local
Expand Down Expand Up @@ -27,4 +27,4 @@
,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,0,usage_iowait,cpu,cpu-total,host.local
,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,0,usage_iowait,cpu,cpu-total,host.local
,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_irq,cpu,cpu-total,host.local
,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
4 changes: 2 additions & 2 deletions functions/testdata/meta_query_keys.out.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,string,string,string,string,string
#partition,false,false,true,true,true,true,false
#group,false,false,true,true,true,true,false
#default,0,,,,,,
,result,table,_field,_measurement,cpu,host,_value
,,0,usage_guest,cpu,cpu-total,host.local,_field
Expand Down Expand Up @@ -34,7 +34,7 @@
,,4,usage_irq,cpu,cpu-total,host.local,host

#datatype,string,long,string,string
#partition,false,false,false,false
#group,false,false,false,false
#default,1,,,
,result,table,host,_value
,,0,host.local,host.local
Expand Down
4 changes: 2 additions & 2 deletions functions/testdata/meta_query_measurements.in.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string,string,string
#partition,false,false,false,false,false,false,true,true,true,true,true,true
#group,false,false,false,false,false,false,true,true,true,true,true,true
#default,_result,,,,,,,,,,,
,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
,,90,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,318324641792,free,disk,disk1s1,apfs,host.local,/
Expand All @@ -15,4 +15,4 @@
,,91,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,9223372036853184344,inodes_free,disk1,disk1s1,apfs,host.local,/
,,91,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,9223372036853184345,inodes_free,disk2,disk1s1,apfs,host.local,/
,,92,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,9223372036854775807,inodes_total,disk2,disk1s1,apfs,host.local,/
,,92,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,9223372036854775807,inodes_total,disk2,disk1s1,apfs,host.local,/
,,92,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,9223372036854775807,inodes_total,disk2,disk1s1,apfs,host.local,/
2 changes: 1 addition & 1 deletion functions/testdata/meta_query_measurements.out.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#datatype,string,long,string,string
#partition,false,false,false,false
#group,false,false,false,false
#default,_result,,,
,result,table,_measurement,_value
,,0,disk,disk
Expand Down

0 comments on commit cdb915b

Please sign in to comment.