diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-04-30 21:19:03 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-04-30 21:19:03 +0200 |
| commit | f1282ea78bd28f8ab4f15a8633653acb4a58c146 (patch) | |
| tree | b9db7ca04a44a60319effefcf60faef9d6d71ed4 | |
| parent | 29aa7b710da74d459fb823d8fec4664a0baa58c4 (diff) | |
Avoid exiting in-between queues
| -rw-r--r-- | cmd/lftpq/main_test.go | 3 | ||||
| -rw-r--r-- | queue/queue.go | 2 | ||||
| -rw-r--r-- | queue/queue_test.go | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/cmd/lftpq/main_test.go b/cmd/lftpq/main_test.go index 382f9b8..7eea98b 100644 --- a/cmd/lftpq/main_test.go +++ b/cmd/lftpq/main_test.go @@ -163,12 +163,10 @@ t2 /baz/foo.2018 queue mirror /foo/bar.2017 /tmp/bar.2017 queue start wait -exit open t2 queue mirror /baz/foo.2018 /tmp/foo.2018 queue start wait -exit ` if got := buf.String(); got != want { t.Errorf("want %s, got %s", want, got) @@ -272,7 +270,6 @@ func TestRun(t *testing.T) { queue mirror /baz/foo.2017 /tmp/foo.2017 queue start wait -exit ` if got := buf.String(); got != want { t.Errorf("want %s, got %s", want, got) diff --git a/queue/queue.go b/queue/queue.go index 80dcd70..53f523c 100644 --- a/queue/queue.go +++ b/queue/queue.go @@ -124,7 +124,7 @@ func (q Queue) MarshalText() ([]byte, error) { buf.WriteString(item.LocalPath) buf.WriteString("\n") } - buf.WriteString("queue start\nwait\nexit\n") + buf.WriteString("queue start\nwait\n") return buf.Bytes(), nil } diff --git a/queue/queue_test.go b/queue/queue_test.go index 0e4581b..13d6fdb 100644 --- a/queue/queue_test.go +++ b/queue/queue_test.go @@ -374,7 +374,6 @@ queue mirror /remote/foo /local queue mirror /remote/bar /local queue start wait -exit ` script := string(out) if script != expected { |