Skip to content

Commit 105e5eb

Browse files
committed
Remove require daemon version for >=1.6
Signed-off-by: apostasie <[email protected]>
1 parent 8e9e464 commit 105e5eb

File tree

5 files changed

+0
-15
lines changed

5 files changed

+0
-15
lines changed

cmd/nerdctl/compose/compose_exec_linux_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ services:
164164
func TestComposeExecTTY(t *testing.T) {
165165
// `-i` in `compose run & exec` is only supported in compose v2.
166166
base := testutil.NewBase(t)
167-
if testutil.GetTarget() == testutil.Nerdctl {
168-
testutil.RequireDaemonVersion(base, ">= 1.6.0-0")
169-
}
170167

171168
var dockerComposeYAML = fmt.Sprintf(`
172169
version: '3.1'

cmd/nerdctl/container/container_exec_linux_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ func TestExecWithUser(t *testing.T) {
5454
func TestExecTTY(t *testing.T) {
5555
t.Parallel()
5656
base := testutil.NewBase(t)
57-
if testutil.GetTarget() == testutil.Nerdctl {
58-
testutil.RequireDaemonVersion(base, ">= 1.6.0-0")
59-
}
6057

6158
testContainer := testutil.Identifier(t)
6259
defer base.Cmd("rm", "-f", testContainer).Run()

cmd/nerdctl/container/container_exec_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ func TestExecWithDoubleDash(t *testing.T) {
5353
func TestExecStdin(t *testing.T) {
5454
t.Parallel()
5555
base := testutil.NewBase(t)
56-
if testutil.GetTarget() == testutil.Nerdctl {
57-
testutil.RequireDaemonVersion(base, ">= 1.6.0-0")
58-
}
5956

6057
testContainer := testutil.Identifier(t)
6158
defer base.Cmd("rm", "-f", testContainer).Run()

cmd/nerdctl/container/container_run_linux_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,6 @@ func TestRunWithInit(t *testing.T) {
311311
func TestRunTTY(t *testing.T) {
312312
t.Parallel()
313313
base := testutil.NewBase(t)
314-
if testutil.GetTarget() == testutil.Nerdctl {
315-
testutil.RequireDaemonVersion(base, ">= 1.6.0-0")
316-
}
317314

318315
const sttyPartialOutput = "speed 38400 baud"
319316
// unbuffer(1) emulates tty, which is required by `nerdctl run -t`.

cmd/nerdctl/container/container_run_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,6 @@ func TestRunHostnameEnv(t *testing.T) {
237237
func TestRunStdin(t *testing.T) {
238238
t.Parallel()
239239
base := testutil.NewBase(t)
240-
if testutil.GetTarget() == testutil.Nerdctl {
241-
testutil.RequireDaemonVersion(base, ">= 1.6.0-0")
242-
}
243240

244241
const testStr = "test-run-stdin"
245242
opts := []func(*testutil.Cmd){

0 commit comments

Comments
 (0)