Skip to content

Commit

Permalink
Merge remote-tracking branch 'kl2-remote/add_amend_test_vtfs' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
dkj committed Oct 14, 2014
2 parents 13a7103 + e9c85f7 commit cc2f960
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 4 deletions.
40 changes: 40 additions & 0 deletions t/data/simple_carping_pipeline1.vtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"description": "minimal carping test pipeline - works, but I/O port names are poorly named. See log for warning",
"nodes":[
{ "id": "n1",
"type": "EXEC",
"cmd": "echo stuff",
"use_STDIN": 0,
"use_STDOUT": 1
},
{ "id": "n2",
"type": "EXEC",
"cmd": ["cat"],
"use_STDIN": 1,
"use_STDOUT": 1
},
{ "id": "m",
"type": "EXEC",
"cmd": ["echo", "stuff"],
"use_STDIN": false,
"use_STDOUT": true
},
{ "id": "d",
"type": "EXEC",
"cmd": "diff __IN1__ __IN2__",
"use_STDIN": 0,
"use_STDOUT": 0
}
],
"edges":[
{ "from": "n1",
"to": "n2"
},
{ "from": "n2",
"to": "d:__IN1__"
},
{ "from": "m",
"to": "d:__IN2__"
}
]
}
40 changes: 40 additions & 0 deletions t/data/simple_failing_io_pipeline1.vtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"description": "minimal failing test pipeline. Port name in edge does not match one in node definition. Also carps about poorly named __IN1__ and __INN2__ ports",
"nodes":[
{ "id": "n1",
"type": "EXEC",
"cmd": "echo stuff",
"use_STDIN": 0,
"use_STDOUT": 1
},
{ "id": "n2",
"type": "EXEC",
"cmd": ["cat"],
"use_STDIN": 1,
"use_STDOUT": 1
},
{ "id": "m",
"type": "EXEC",
"cmd": ["echo", "stuff"],
"use_STDIN": false,
"use_STDOUT": true
},
{ "id": "d",
"type": "EXEC",
"cmd": "diff __IN1__ __IN2__",
"use_STDIN": 0,
"use_STDOUT": 0
}
],
"edges":[
{ "from": "n1",
"to": "n2"
},
{ "from": "n2",
"to": "d:__IN1__"
},
{ "from": "m",
"to": "d:__INN2__"
}
]
}
40 changes: 40 additions & 0 deletions t/data/simple_failing_io_pipeline2.vtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"description": "minimal failing test pipeline. Port names in edges match the node definitions, but are of the wrong type",
"nodes":[
{ "id": "n1",
"type": "EXEC",
"cmd": "echo stuff",
"use_STDIN": 0,
"use_STDOUT": 1
},
{ "id": "n2",
"type": "EXEC",
"cmd": ["cat"],
"use_STDIN": 1,
"use_STDOUT": 1
},
{ "id": "m",
"type": "EXEC",
"cmd": ["echo", "stuff"],
"use_STDIN": false,
"use_STDOUT": true
},
{ "id": "d",
"type": "EXEC",
"cmd": "diff __IN_1__ __OUT_2__",
"use_STDIN": 0,
"use_STDOUT": 0
}
],
"edges":[
{ "from": "n1",
"to": "n2"
},
{ "from": "n2",
"to": "d:__IN_1__"
},
{ "from": "m",
"to": "d:__OUT_2__"
}
]
}
2 changes: 1 addition & 1 deletion t/data/simple_failing_pipeline.vtf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "minimal failing test pipeline",
"description": "minimal failing test pipeline. Fails because of false in cmd. Also carps about poorly named __IN1__ and __IN2__ ports",
"nodes":[
{ "id": "n1",
"type": "EXEC",
Expand Down
6 changes: 3 additions & 3 deletions t/data/simple_pipeline.vtf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
{ "id": "d",
"type": "EXEC",
"cmd": "diff __IN1__ __IN2__",
"cmd": "diff __IN_1__ __IN_2__",
"use_STDIN": 0,
"use_STDOUT": 0
}
Expand All @@ -31,10 +31,10 @@
"to": "n2"
},
{ "from": "n2",
"to": "d:__IN1__"
"to": "d:__IN_1__"
},
{ "from": "m",
"to": "d:__IN2__"
"to": "d:__IN_2__"
}
]
}

0 comments on commit cc2f960

Please sign in to comment.