# # # patch "tests/ssh_agent/__driver__.lua" # from [42f9775d48564618da6af408c09d0b944572de8c] # to [6b56ec99682bcc7b906ee7d5f06d6bde706d9440] # ============================================================ --- tests/ssh_agent/__driver__.lua 42f9775d48564618da6af408c09d0b944572de8c +++ tests/ssh_agent/__driver__.lua 6b56ec99682bcc7b906ee7d5f06d6bde706d9440 @@ -16,6 +16,12 @@ check(mtn("--key", "address@hidden", "ssh_agent -- * (E) export key with -k that does not exist check(mtn("--key", "address@hidden", "ssh_agent_export"), 1, false, false) +-- * (ok) export key without -k +check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd", + "--db=" .. test.root .. "/test.db", + "--keydir", test.root .. "/keys", + "ssh_agent_export"), 0, false, false) + -- * (ok) export key with -k that does exist check(mtn("--key", "address@hidden", "ssh_agent_export"), 0, false, false) @@ -24,7 +30,6 @@ check(mtn("ssh_agent_export"), 0, true, -- * (ok) export monotone key without passphrase check(mtn("ssh_agent_export"), 0, true, false) --- io.output("id_monotone"):write(io.input("stdout"):read()) rename("stdout", "id_monotone") skip_if(not existsonpath("chmod")) check({"chmod", "600", "id_monotone"}, 0, false, false) @@ -123,10 +128,44 @@ check(mtn("ci", "--ssh-sign=check", "--m -- -- with multiple monotone keys: +check(mtn("genkey", "address@hidden"), 0, false, false) + -- * (N) try to export monotone key without -k +remove("_MTN/options") +check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd", + "--db=" .. test.root .. "/test.db", + "--keydir", test.root .. "/keys", + "ssh_agent_export"), 1, false, false) + -- * (ok) export monotone key with -k +check(mtn("ssh_agent_export", "--key", "address@hidden"), 0, false, false) +rename("stdout", "id_monotone2") +skip_if(not existsonpath("chmod")) +check({"chmod", "600", "id_monotone2"}, 0, false, false) + -- * (ok) mtn ci with -k and with ssh-agent running with no keys +check({"ssh-add", "-D"}, 0, false, false) +addfile("some_file15", "test") +check(mtn("ci", "--key", "address@hidden", "--message", "commit msg"), 0, false, false) + -- * (ok) mtn ci with -k and with ssh-agent running with one non-monotone rsa key +check({"ssh-add", "id_rsa"}, 0, false, false) +addfile("some_file16", "test") +check(mtn("ci", "--key", "address@hidden", "--message", "commit msg"), 0, false, false) + -- * (ok) mtn ci with -k and with ssh-agent running with same monotone key ex/imported key +check({"ssh-add", "id_monotone"}, 0, false, false) +addfile("some_file17", "test") +check(mtn("ci", "--ssh-sign", "only", "--key", "address@hidden", "--message", "commit msg"), 0, false, false) + -- * (ok) mtn ci with -k and with ssh-agent running with other monotone key ex/imported key +addfile("some_file18", "test") +check(mtn("ci", "--ssh-sign", "only", "--key", "address@hidden", "--message", "commit msg"), 1, false, false) +check(mtn("ci", "--key", "address@hidden", "--message", "commit msg"), 0, false, false) + -- * (ok) mtn ci with -k and with ssh-agent running with both montone keys ex/imported key +check({"ssh-add", "id_monotone2"}, 0, false, false) +addfile("some_file19", "test") +check(mtn("ci", "--key", "address@hidden", "--message", "commit msg"), 0, false, false) +addfile("some_file20", "test") +check(mtn("ci", "--key", "address@hidden", "--message", "commit msg"), 0, false, false)