# # # delete "tests/t_check_same_db_contents.at" # # delete "tests/t_cmdline_options.at" # # delete "tests/t_crlf.at" # # delete "tests/t_db_with_dots.at" # # delete "tests/t_drop_rename_patch.at" # # delete "tests/t_lca_1.at" # # delete "tests/t_log_nonexistent.at" # # delete "tests/t_merge_ancestor.at" # # delete "tests/t_netsync_diffbranch.at" # # delete "tests/t_netsync_nocerts.at" # # delete "tests/t_persistent_server_keys_2.at" # # delete "tests/t_propagate_anc.at" # # delete "tests/t_propagate_desc.at" # # delete "tests/t_rename_added_in_rename.at" # # delete "tests/t_rename_conflict.at" # # delete "tests/t_rename_dir_cross_level.at" # # delete "tests/t_rename_dir_patch.at" # # delete "tests/t_status_missing.at" # # delete "tests/t_subdir_add.at" # # delete "tests/t_subdir_attr.at" # # delete "tests/t_subdir_drop.at" # # delete "tests/t_subdir_rename.at" # # delete "tests/t_subdir_revert.at" # # delete "tests/t_update_1.at" # # delete "tests/t_update_2.at" # # delete "tests/t_vcheck.at" # # add_dir "tests/(imp)_persistent_netsync_server_-_keys_2" # # add_dir "tests/(minor)_drop_in_subdir" # # add_dir "tests/(normal)_netsync_revision_with_no_certs" # # add_dir "tests/(normal)_update_across_discontinuity" # # add_dir "tests/(todo)_vcheck" # # add_dir "tests/--db_with_parent_dir" # # add_dir "tests/CRLF_line_normalization" # # add_dir "tests/add_in_subdir" # # add_dir "tests/attr_command_in_subdirs" # # add_dir "tests/check_same_db_contents_macro" # # add_dir "tests/log_hides_deleted_renamed_files" # # add_dir "tests/merge((),_(drop_a,_rename_b_a,_patch_a))" # # add_dir "tests/merge((patch_foo_a),_(rename_foo__bar_))" # # add_dir "tests/merge((rename_a_b),_(rename_a_c))" # # add_dir "tests/merge_rev_with_ancestor" # # add_dir "tests/merge_with_add,_rename_file,_and_rename_dir" # # add_dir "tests/propagate_a_descendent" # # add_dir "tests/propagate_an_ancestor" # # add_dir "tests/pull_a_netsync_branch_which_has_a_parent_from_another_branch" # # add_dir "tests/rename_dir_to_non-sibling" # # add_dir "tests/rename_in_subdir" # # add_dir "tests/revert_in_subdirs" # # add_dir "tests/status_with_missing_files" # # add_dir "tests/update_1" # # add_dir "tests/verification_of_command_line_options" # # add_file "tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua" # content [2fe10078108e4d096b9dbcf5f06646aafa48caa4] # # add_file "tests/(minor)_drop_in_subdir/__driver__.lua" # content [e8ecb4d8e91781f0b0fcb0d184767e646b52d2d6] # # add_file "tests/(normal)_netsync_revision_with_no_certs/__driver__.lua" # content [2bbd52668852e70d2de34efa8691dfed064f3eb6] # # add_file "tests/(normal)_update_across_discontinuity/__driver__.lua" # content [8fd96d99da75242a0703c267c6bd4f0df6180e87] # # add_file "tests/(todo)_vcheck/__driver__.lua" # content [26c7b8279a7f63535a404a9cec8b8785f3802e13] # # add_file "tests/--db_with_parent_dir/__driver__.lua" # content [95713981f35c087fc85e55c50a7b594f16696c77] # # add_file "tests/CRLF_line_normalization/__driver__.lua" # content [eaf9c1e686d022b0f806c38f22cbaddb340c6a28] # # add_file "tests/add_in_subdir/__driver__.lua" # content [06668cf5a3942f2b2ee679947589fb9680c647ef] # # add_file "tests/attr_command_in_subdirs/__driver__.lua" # content [20f2a5abb30a48aedff68354181c60a51da2fc09] # # add_file "tests/check_same_db_contents_macro/__driver__.lua" # content [cec4d0b7f5781b8f6022176ec4be5a9f234a18dc] # # add_file "tests/log_hides_deleted_renamed_files/__driver__.lua" # content [cd5e5d27ca6488b61b6672a762f313c85e1f05c1] # # add_file "tests/log_hides_deleted_renamed_files/first" # content [853a3aad88fc43b1a5be36de55f5b3dc9dde46bb] # # add_file "tests/log_hides_deleted_renamed_files/second" # content [e95e6725d7d2ef8a6ea877ed380c3698ef49e4ed] # # add_file "tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua" # content [0fbb2ea669d060ce7588816d64101ede8e567334] # # add_file "tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua" # content [3c8d9c94096b94a42aa6cc6d89d0a351b404e207] # # add_file "tests/merge((rename_a_b),_(rename_a_c))/__driver__.lua" # content [9321316dd8f07d73f429075d838059da35587abb] # # add_file "tests/merge_rev_with_ancestor/__driver__.lua" # content [7a11b3b2570698ef3120a296899ed9876d0b7720] # # add_file "tests/merge_with_add,_rename_file,_and_rename_dir/__driver__.lua" # content [66db7642587c0226a690e745d3cafcc44293c4e5] # # add_file "tests/propagate_a_descendent/__driver__.lua" # content [4e0c0d2b067b011a061e290db194b6a5c60d58cf] # # add_file "tests/propagate_an_ancestor/__driver__.lua" # content [9e3fc70664c1d7c917171fd9e2ddaf40e7e1a888] # # add_file "tests/pull_a_netsync_branch_which_has_a_parent_from_another_branch/__driver__.lua" # content [39e7147a85425a27ab720a1dee7f120f55dcc831] # # add_file "tests/rename_dir_to_non-sibling/__driver__.lua" # content [f8dc21e12ae8f3b34d21cd9aa35a0b963fb9f9a4] # # add_file "tests/rename_in_subdir/__driver__.lua" # content [d9d851ec083f3270f258c477ee7eaef3c0e9530a] # # add_file "tests/revert_in_subdirs/__driver__.lua" # content [be726716d4ab49c14ce77b1d03abbcbe3e4ef76d] # # add_file "tests/status_with_missing_files/__driver__.lua" # content [715149ce1c5c941ca4e1344d53b0dd690d13fac8] # # add_file "tests/update_1/__driver__.lua" # content [a54dcea9e22857d2e21d5e7f5a55961482d959e9] # # add_file "tests/verification_of_command_line_options/__driver__.lua" # content [acb107efa511a9e99eda01333c5f2d3c5b712925] # # patch "tester.cc" # from [d40ade4fec88a65942ab694afca516330a65b639] # to [01ceaa6974040125059f3d96204399ef8faa3103] # # patch "tester.lua" # from [c8a5857dde20aefa3c26de1680bf0cb7679e0937] # to [92bd519bdfaca67c77c6db0acd7ea042c59507f8] # # patch "tests/'heads'/__driver__.lua" # from [e9946a22ae4f0ad372209105d2a59b06dce00623] # to [8e365adecc55f93d4c2ef80be9604e50c4063600] # # patch "tests/'heads'_with_discontinuous_branches/__driver__.lua" # from [7059df07d5993350e3d1e1d66441c4a239bf2365] # to [9d517a63e2ab2a0d66cbc170d06b04264ed1e0b8] # # patch "tests/(imp)_deleting_directories/__driver__.lua" # from [0d3603c80d9a1a050583306a4518952ae46f3422] # to [1647676a62a47c09d1e343614b53860c7d588516] # # patch "tests/(minor)_update_cleans_emptied_directories/__driver__.lua" # from [41b21eae0ae20ea501388ca9c1a90710ea5cf501] # to [6d91c357804f5a45addd1df316ec080e958af5e9] # # patch "tests/(normal)_netsync_on_partially_unrelated_revisions/__driver__.lua" # from [ba7f6002567f543835f899351d0b9ccc657302f8] # to [e4a38f668b917cbecbfd6f57c58e4e74e9b49bb9] # # patch "tests/--rcfile_requires_extant_file/__driver__.lua" # from [879ac16a69e9c3bea190bbcc525cb58d977d91e9] # to [08faec0b56f2821dc211a9b1c7deb3578cf218e9] # # patch "tests/add_and_then_drop_file_does_nothing/__driver__.lua" # from [ed74475c0927b2c9c47ab97388d3460fdfd3fe07] # to [6f0ad37e82016507c3da274fcd361db3569cd4af] # # patch "tests/addition_of_files_and_directories/__driver__.lua" # from [122cd653d6207b86b5af26699414ae3c3e4b8bce] # to [918c1b3bd41fa3f9c4e67e64255221431e2481db] # # patch "tests/attr_set_attr_get/__driver__.lua" # from [d13140261712c3842a400760b3d831253f15bec2] # to [3f79c421ec71d9f91892cdf4e8824d6de6d2c5ec] # # patch "tests/attr_set_get_commands/__driver__.lua" # from [cf3184ab7f485cc0d78eaa56315354f88b280494] # to [5fa53a0df58c2faed1ba6d76646e39f6a62c0318] # # patch "tests/basic_invocation_and_options/__driver__.lua" # from [2f5545530879be900feceb93e3434485202e8137] # to [9f5fde123d08c98d315fd296942c7da7f256fe85] # # patch "tests/calculation_of_other_unidiffs/__driver__.lua" # from [3e252f3773737b1c3732d31bd555019b1ef78d53] # to [8ef9ea4938ad4817028e9193a82405b544eedcb7] # # patch "tests/calculation_of_unidiffs/__driver__.lua" # from [dc4049addaabebcced1d345d174db4e7abcaa7e1] # to [7f47ccd3bd189c2eaca4ae5126635032509195ab] # # patch "tests/changing_passphrase_of_a_private_key/__driver__.lua" # from [07157ac02b192bf7f97b7c19f8398a6811007769] # to [ef0c7331465d50066cb1eac75271046fb6523030] # # patch "tests/checkout_creates_right__MTN_options/__driver__.lua" # from [d81cdfcfc714d9177a76fe1893b29ac82c0f5276] # to [96e523c6d38b613a00babbcfa0541d97fca816a1] # # patch "tests/checkout_validates_target_directory/__driver__.lua" # from [abf318148884207d412f7f064d350ce298bbcdd5] # to [8e28d8ea40dc00dd3c11342d218c84b96df8ebf8] # # patch "tests/creating_a_bad_criss-cross_merge/__driver__.lua" # from [1e60df2be65bc9164124f5ac8bc223cb11d34db4] # to [997c41fef50984e7609e886835e256ef3c8cca8a] # # patch "tests/creating_a_fork/__driver__.lua" # from [0418474ec669629846a06b2f8b436ee4677418d4] # to [570f5cf8f62d1867d089592a97666487cc7d8da3] # # patch "tests/creating_a_fork_and_merging/__driver__.lua" # from [edf276b996aa4bde792cf36fefcf8bcc9bc86f93] # to [aabf962e9dd0ecff78c86288fdf3f2c57e231844] # # patch "tests/creating_a_fork_and_updating/__driver__.lua" # from [ae10a22f93591ac1fdf32104e372fc4ddec16026] # to [213098c02d50942968283ae5a5bc10a1569ad651] # # patch "tests/creating_a_good_and_bad_test_result/__driver__.lua" # from [8057102a8f32c3ab8811f472f7a2f1a6574f6d74] # to [28c620730a25c24afa3ad4000ad74f2ba6e54c13] # # patch "tests/database_dump_load/__driver__.lua" # from [26b6f8e0b8497fde25cd9d432edd1f4ac5c7dcfd] # to [1a88a1146a252d753b5d6ee05ec98debb84789d6] # # patch "tests/delete_work_file_on_checkout/__driver__.lua" # from [83bdf136c65453873abd9b44139032aaa27c2eb6] # to [82d14343e33b5119bf3d739e4ca89b446d2a9e06] # # patch "tests/diffing_a_revision_with_an_added_file/__driver__.lua" # from [a5ecf57cdffe2f8a3adae115d4be50a2f34dd5a7] # to [d221be9fd6460f6e9e16498db2910dba3a3cf1ee] # # patch "tests/disapproving_of_a_revision/__driver__.lua" # from [b30c89146ff365d9a5c73927e82119fa27d6521d] # to [45496133759ae45e279b3e4c45f5325597d59e0b] # # patch "tests/drop_missing_and_unknown_files/__driver__.lua" # from [c13655b9cd05d58f28cf28c410a117cc25b09292] # to [6460ea6a3b90bbe432ef53dd9774c8d01dfbe0f2] # # patch "tests/exchanging_work_via_netsync/__driver__.lua" # from [fa77d92622ec4fffa856326dcc98a1e90988ac76] # to [16e19052a2f83d67cef7b23182fbfc42d630e8a5] # # patch "tests/explicit_merge/__driver__.lua" # from [f8a9fd534b53149ca200fcd6f8ff78b886f02bff] # to [bc1c384cd88f7947e9f53ddb646bf14eb71f388d] # # patch "tests/external_unit_test_of_the_line_merger/__driver__.lua" # from [2ea0037fd766a52688bf3ff24709c9f9fea94c7f] # to [b3273eb163740231020a773429034334f46a71a0] # # patch "tests/first_extent_normalization_pass/__driver__.lua" # from [59f5d1bc8ca96a2da85b7f3639471ff4cb4acaf9] # to [aaceb1dcdedaf5d90ae9760f0743969f6336e528] # # patch "tests/generating_and_extracting_keys_and_certs/__driver__.lua" # from [4f85b1411adccd44f763f86292da5b1a2f2c6ee0] # to [f6b0ea44a54f35e7c5cba81901fa80851e537f4d] # # patch "tests/importing_CVS_files/__driver__.lua" # from [a63f2eb6c193e70c451e6d5fd0ae3a8c21ffa4f6] # to [c0187ccc14b3b1beb413aeee4361c19d52387b97] # # patch "tests/importing_a_CVS_file_with_one_version/__driver__.lua" # from [2e1237dc81f133325edf90326d472775d50d7fe5] # to [44497c092858e43cd0dbb2ee1204bb5ec5fa0787] # # patch "tests/importing_a_file/__driver__.lua" # from [04fadf6255b7ba1d4139d9e952cff68a1ccd2cc7] # to [1dc0e7c7c7723f74621f2c5aa58bce5ca8f8947f] # # patch "tests/importing_files_with_non-english_names/__driver__.lua" # from [b6d843c4a101c679ce29f26d4474836878a6da65] # to [8502ed1cd131fa725e65abc4736ec5fb736f2fad] # # patch "tests/list_missing_files/__driver__.lua" # from [b926a8569fada085efe533609783127919ef0843] # to [b134a041b42a0cd745398b98fad82aa016df949b] # # patch "tests/manifest_restrictions/__driver__.lua" # from [0f07ea8cd7d9ec8b63f48f008a2d10ee7492a7a1] # to [a3aa4b28c821c39e85db8bab4469bb437ded40c5] # # patch "tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua" # from [b0c2c29a5d98eff77f2fc62a12987ef53a05420f] # to [b567ed88b67b06445deec99e9d3019123c8aebeb] # # patch "tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua" # from [7a40015398252bda3fca04a1af6ba108f5633b65] # to [5460bea6c9e6ac125b2138d5a2747bcd346790ae] # # patch "tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua" # from [606e29b2a9ee0908c8e6cd49deca0f4924b9e48f] # to [dac336dbf180056dbe184723f0504f861ea563bc] # # patch "tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua" # from [91b4b480be1eb7445c73c4a9d889c1237a7700bb] # to [ef0b509c5f7b1bc19b3c8060130647cc00a9fb36] # # patch "tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua" # from [4478c937bffa6df632675027e4bf9f01f64c9a7d] # to [567651816fcf9dc5bde90899d2739f9703f836fd] # # patch "tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua" # from [a85e07e9d549c8faa150e10957f529a8cead3948] # to [a43d6187d0ccfd94a6def14211b952c86a869473] # # patch "tests/merging_a_rename_twice/__driver__.lua" # from [473ca98c8bb0ff9f01edd8eae5c02fa6b5ed3c67] # to [31a1be043ecb8735f0c09ade850b5aed6540f694] # # patch "tests/merging_adds/__driver__.lua" # from [dfb2cf3a556ab1477e77e79d064a4b74f2857bea] # to [3d022afdda9830918a4f448546bdb059f1b4d570] # # patch "tests/merging_adds_in_unrelated_revisions/__driver__.lua" # from [3573d2502f0f5b458dc75a54cb976baec7057338] # to [22ec6f9238dfac16e2ea67361e90d142d38ada80] # # patch "tests/merging_an_add_edge/__driver__.lua" # from [73d4d648e483f04fe35c9d70f127b080870f2bed] # to [40999b2c29efbd8e9f98e7bdc7bb880c3a49f87b] # # patch "tests/merging_data_in_unrelated_files/__driver__.lua" # from [2675e2d9795e4a10c53ef95c13b23b5040815ac2] # to [c64d4c93b6212896eed7ba97fec668af843213de] # # patch "tests/merging_data_in_unrelated_revisions/__driver__.lua" # from [162fb9899df051fba839e65d2066fa927fe544db] # to [2cf02eca460fb6f458c50396be7a8a4763acd578] # # patch "tests/mtn_add_dot/__driver__.lua" # from [f415932a2ab7d4b107f73369c67c58be9c6d05e3] # to [74f5fb10c01664357f17c76e6ff2056dbb2bd5b5] # # patch "tests/multiple_version_committing/__driver__.lua" # from [f4e5e8bf962c73fbac206322b2ef3d0eedd2d955] # to [511ce318109104c815f97bd757e1481ee611defa] # # patch "tests/netsync_transfers_public_keys/__driver__.lua" # from [be1446c019833ef0be51f560d39767aee6ded881] # to [1e4004a3d09ba2223ccace79a66d1c8bdcaed5c0] # # patch "tests/no-change_deltas_disappear/__driver__.lua" # from [6bedf84a5390a8ebf2bbc3b03cfb99c7948da842] # to [93be632c2e4e6ee8d6f8a9bea2ca8969c16c86f6] # # patch "tests/persistence_of_passphrase/__driver__.lua" # from [95450071d2c5bfc025f225d9c2fe9722ac6efba1] # to [0409770163b399bbf796bf2c7427111d07ef7f2b] # # patch "tests/persistent_netsync_server_-_keys/__driver__.lua" # from [23f5e46ab0916fa3be47fad94e77d9a9fce06e7f] # to [a73946ef1a105f8f5751b4c5b7afa130b5709b87] # # patch "tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua" # from [138dd2eebf0cde0914a678facee439f8186914a7] # to [426e9f7e63c3f96c69580449eda4419383427e7e] # # patch "tests/renaming_a_deleted_file/__driver__.lua" # from [3e19173031269466aed55561cbf8a30bd5de735e] # to [501b87196920ba58a8a1f8899919d1a512c2e740] # # patch "tests/renaming_a_directory/__driver__.lua" # from [d3136bb1f240bf8855276b841aa278f8f4c0869f] # to [ff5e5566bd6d5aae450febf324ded5ed8f3065a7] # # patch "tests/renaming_a_file/__driver__.lua" # from [98a709e7e3a932a7e8fc1283aeb3b5cbaa9f2fbe] # to [35d1d7058771cd2d329f33ee7fff869c4e203621] # # patch "tests/renaming_a_patched_file/__driver__.lua" # from [32ee3c13f0f2ef0aad23ec544da1aaa7b00d0ae0] # to [f67c4c450d5d65e951d045e6547681341ec38d1e] # # patch "tests/renaming_and_editing_a_file/__driver__.lua" # from [7fcfa15642b32a2fa515afa84e1b54df0323d53b] # to [650e40f16b0106da5727988543b69617aefba61a] # # patch "tests/repeatedly_exchanging_work_via_netsync/__driver__.lua" # from [3e6428db18e19dc383f3fe3cef9b4f2b28b6fc84] # to [c4be0ca44b72f23097f18b6e0a99127237759bc1] # # patch "tests/revert_file_to_base_revision/__driver__.lua" # from [15e25506eba289749c75a219f1f337092634d79c] # to [3938aaef0d2b8aea9e80f164edd46b1d1b2f9786] # # patch "tests/scanning_trees/__driver__.lua" # from [a66978e67c950281be7dbc3999b751bf60de6310] # to [f98578fc16ef652ad5b5bbba5387ddc05a98795a] # # patch "tests/schema_migration/__driver__.lua" # from [8e0ee3155b00e70efcd15f5b210330388ddf5b9f] # to [bdfc5b96c09274e280f740759e412a595f77a560] # # patch "tests/single_character_filename_support/__driver__.lua" # from [f606b0b2e75e3900a5d5344ecb762c53eb9d1521] # to [c7021579482c50f1b617fc60adbc308b7345e2f7] # # patch "tests/single_manifest_netsync/__driver__.lua" # from [830f2ffecf6cb342af16a385146a750fede897de] # to [337cc66d8318ef7f7aec4b37ea1344e3d135d06d] # # patch "tests/subdirectory_restrictions/__driver__.lua" # from [90273b74c39f59bba9b57ed2c1ab6115645f3b35] # to [353202bac216de08ce38f9a86a6038d7f1277e99] # # patch "tests/tags_and_tagging_of_revisions/__driver__.lua" # from [6bfccf13721299af333b1a8abea99594ca9d562c] # to [dc29bb0db25ad55d49d44c7923eb57c3c6e37a2b] # # patch "tests/test_a_merge/__driver__.lua" # from [17cae767d80b9c4b1eec42fc85c367a8e60d2c63] # to [56aeb71615373818f2e6a3e01a07d8f3545c48d0] # # patch "tests/test_a_merge_2/__driver__.lua" # from [36bed683bb6f955ae6ed03f9f8b4f507ab0c3cca] # to [3f31d6570b3f7b7ab7fc26f373a1b1c31283fe6b] # # patch "tests/trust_hooks_and_'trusted'_command/__driver__.lua" # from [2fb2c800231ec5cfaedb2c6d5aa261c4e23af59b] # to [317ce678a1bd355e4c39534e62537424eda07992] # # patch "tests/update_with_multiple_candidates/__driver__.lua" # from [6023653c9e719109c4b94f1fad13105a8d5b522c] # to [8e8fefe20f694600a91315bab132218097a3feae] # # patch "tests/updating_from_a_merge_which_adds_a_file/__driver__.lua" # from [14c179004eb8d2a7179f077e17a1d9d22d21d733] # to [9de36d12c49f6b36cb33978609f2c86412376199] # # patch "tests/updating_to_a_given_revision/__driver__.lua" # from [12fa7e799cfeed20b60a2dc34a02e32890240809] # to [2e9125c5c94c5c87a921ff6cb143918dcc8cd489] # # patch "testsuite.at" # from [52399f271c1496a2836dc4dc9b609c7dbe7793ab] # to [2bcc5a412f1cb76ab24165ad2697e8f881c368a2] # # patch "testsuite.lua" # from [f9ca814a66d5ff54286169fa0b10c8c607278063] # to [6c68826f2da27424628a0ce5be843955a443b258] # ============================================================ --- tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua 2fe10078108e4d096b9dbcf5f06646aafa48caa4 +++ tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua 2fe10078108e4d096b9dbcf5f06646aafa48caa4 @@ -0,0 +1,31 @@ + +mtn_setup() +netsync.setup() + +-- This tests a somewhat subtle version of how public keys are handled +-- with netsync. The rule is, we serve a key if we're serving any cert +-- signed by that key. The question is, if when we boot up the server +-- we already have the key in question, but it isn't signing any such +-- certs, but _then we get pushed such a cert_, do we push out the key +-- on further netsyncs? + +-- We create a key in database 2, read the public key into database 1, +-- then start database 1 serving. Then we push a cert into database 1 +-- signed by the key, and we pull into database 3. + +check(mtn2("genkey", "address@hidden"), 0, false, false, string.rep("address@hidden", 2)) +check(mtn2("pubkey", "address@hidden"), 0, true) +rename("stdout", "stdin") +check(mtn("read"), 0, false, false, true) + +addfile("foo", "data data blah") +check(mtn2("status"), 0, false, false) +check(mtn2("commit", "address@hidden", "--branch=testbranch", "-m", 'commit foo'), 0, false, false) + +srv = netsync.start("testbranch") +srv:push("testbranch", 2) +srv:pull("testbranch", 3) +srv:finish() + +check(mtn3("ls", "keys"), 0, true, false) +check(qgrep("address@hidden", "stdout")) ============================================================ --- tests/(minor)_drop_in_subdir/__driver__.lua e8ecb4d8e91781f0b0fcb0d184767e646b52d2d6 +++ tests/(minor)_drop_in_subdir/__driver__.lua e8ecb4d8e91781f0b0fcb0d184767e646b52d2d6 @@ -0,0 +1,25 @@ + +mtn_setup() + +mkdir("subdir") +mkdir("subdir/anotherdir") +writefile("subdir/foo", "data data") +writefile("subdir/anotherdir/bar", "more data") +check(mtn("add", "."), 0, false, false) +commit() +rev = base_revision() + +-- Create a checkout we can update +check(mtn("checkout", "--revision", rev, "codir"), 0, false, false) + +chdir("subdir") +check(mtn("drop", "foo"), 0, false, false) +check(mtn("drop", "--recursive", "anotherdir"), 0, false, false) +chdir("..") +commit() + +chdir("codir") +check(mtn("update"), 0, false, false) +chdir("..") +check(not exists("codir/subdir/foo")) +check(not exists("codir/subdir/anotherdir/bar")) ============================================================ --- tests/(normal)_netsync_revision_with_no_certs/__driver__.lua 2bbd52668852e70d2de34efa8691dfed064f3eb6 +++ tests/(normal)_netsync_revision_with_no_certs/__driver__.lua 2bbd52668852e70d2de34efa8691dfed064f3eb6 @@ -0,0 +1,24 @@ + +mtn_setup() +netsync.setup() + +revs = {} + +addfile("testfile", "blah stuff") +commit() +revs[0] = base_revision() + +check(mtn("db", "execute", 'delete from revision_certs'), 0, false, false) + +writefile("testfile", "other stuff") +commit() +revs[1] = base_revision() + +netsync.pull("testbranch") + +for _,x in revs do + check_same_stdout(mtn("automate", "get_revision", x), + mtn2("automate", "get_revision", x)) + check_same_stdout(mtn("ls", "certs", x), + mtn2("ls", "certs", x)) +end ============================================================ --- tests/(normal)_update_across_discontinuity/__driver__.lua 8fd96d99da75242a0703c267c6bd4f0df6180e87 +++ tests/(normal)_update_across_discontinuity/__driver__.lua 8fd96d99da75242a0703c267c6bd4f0df6180e87 @@ -0,0 +1,27 @@ + +mtn_setup() + +-- testing that update is able to jump over discontinuities in +-- branches. If we have A1 -> B1 -> A2, then updating branch A from A1 +-- should get to A2. + +addfile("testfile", "main branch data") +commit("mainbranch") +a1 = base_revision() + +writefile("testfile", "first branch data 1") +commit("firstbranch") +b1 = base_revision() + +writefile("testfile", "first branch data 2") +commit("mainbranch") +a2 = base_revision() + + +revert_to(a1) + +check(mtn("update", "--branch=mainbranch"), 0, false, false) +got = base_revision() + +check(got ~= a1) +check(got == a2) ============================================================ --- tests/(todo)_vcheck/__driver__.lua 26c7b8279a7f63535a404a9cec8b8785f3802e13 +++ tests/(todo)_vcheck/__driver__.lua 26c7b8279a7f63535a404a9cec8b8785f3802e13 @@ -0,0 +1,49 @@ + +mtn_setup() + +-- This test is a bug report (feature request). +xfail_if(true, false) + +-- There used to be a command 'vcheck', that defended against the +-- chance of (accidental or malicious) SHA1 collision. The way it did +-- this was by putting certs named "vcheck" on manifests, and these +-- certs contained a re-hash of that manifest with a nonce attached. +-- (So a MAC, basically.) The idea being that even if two manifests +-- had the same SHA1, they wouldn't have the same salted SHA1. + +-- This functionality is mostly useful for reassuring people's +-- irrational fears, but hey, that's a useful thing to do. (This does, +-- though, probably mean that any replacement should have 0 overhead +-- for people who _aren't_ worried about SHA1 collision.) + +-- The original 'vcheck' was ripped out when manifest and file certs +-- were removed, and never quite did the right thing anyway. (It only +-- applied to manifests, in particular.) It may be useful to reference +-- the code, though: see t:monotone-0.16. In particular, mac.hh should +-- be useful. Note also the section "Accidental collision" in +-- monotone.texi. + +-- There are a few ways to re-add this. The simplest is probably to +-- have a cert on revisions that contains +-- - a salt/nonce +-- - a MAC of the revision +-- - a MAC of the revision's manifest +-- - a MAC of each file within that revision. +-- possibly the last should just be "a MAC of every file mentioned in +-- that revision's list of diff's", so people creating multiple vcheck +-- certs aren't checking the same unchanging files over and over again. +-- This reduces space overhead, too, since certs's space usage adds up, +-- and does so for project members who aren't worried about SHA1 +-- collisions too... +-- +-- an alternative approach would be to contain: +-- - a salt/nonce +-- - a MAC of (length-prefixed revision) + (length prefixed manifest) +-- + (length prefixed versions of each file in the manifest, in manifest order) +-- this is small, and just as safe. it is rather expensive to create +-- or check, though, since you have to load all that data, so maybe the +-- optimization above where you only hash mentioned files would be +-- good. OTOH, if you hash everything, then you can use them +-- sparingly, and be sure that the versions so certed really are safe; +-- if you only hash some pieces, you have to cert your entire history +-- in order to "trust" any one snapshot at all. ============================================================ --- tests/--db_with_parent_dir/__driver__.lua 95713981f35c087fc85e55c50a7b594f16696c77 +++ tests/--db_with_parent_dir/__driver__.lua 95713981f35c087fc85e55c50a7b594f16696c77 @@ -0,0 +1,17 @@ + +mtn_setup() + +mkdir("foo") +chdir("foo") +check(mtn("--db=../new.db", "db", "init"), 0, false, false) +check(mtn("--db=../new.db", "ls", "branches"), 0, false, false) +chdir("..") + +-- paths in _MTN/options should be absolute and not contain .. + +mkdir("bar") +chdir("bar") +check(mtn("--db=../new.db", "--branch=testbranch", "setup", "."), 0, false, false) +chdir("..") +check(grep("new.db", "bar/_MTN/options"), 0, true) +check(grep("-v", "\\.\\.", "stdout"), 0, false, false) ============================================================ --- tests/CRLF_line_normalization/__driver__.lua eaf9c1e686d022b0f806c38f22cbaddb340c6a28 +++ tests/CRLF_line_normalization/__driver__.lua eaf9c1e686d022b0f806c38f22cbaddb340c6a28 @@ -0,0 +1,12 @@ + +mtn_setup() + +addfile("test.crlf", "a\r\nb\r\nc\r\nd\r\n") +commit() + +writefile("test.crlf", "a\r\nb\r\nnew line!\r\nc\r\nd\r\n") + +check(mtn("diff"), 0, true, false) +lines = 0 +for i in io.lines("stdout") do lines = lines + 1 end +check(lines == 16) ============================================================ --- tests/add_in_subdir/__driver__.lua 06668cf5a3942f2b2ee679947589fb9680c647ef +++ tests/add_in_subdir/__driver__.lua 06668cf5a3942f2b2ee679947589fb9680c647ef @@ -0,0 +1,21 @@ + +mtn_setup() + +mkdir("subdir") +mkdir("subdir/anotherdir") +writefile("subdir/foo", "data data") +writefile("subdir/anotherdir/bar", "more data") + +-- Add a file +chdir("subdir") +check(mtn("add", "foo"), 0, false, false) +-- Add a directory +check(mtn("add", "anotherdir"), 0, false, false) +chdir("..") + +commit() +rev = base_revision() + +check(mtn("checkout", "--revision", rev, "codir"), 0, false, false) +check(samefile("subdir/foo", "codir/subdir/foo")) +check(samefile("subdir/anotherdir/bar", "codir/subdir/anotherdir/bar")) ============================================================ --- tests/attr_command_in_subdirs/__driver__.lua 20f2a5abb30a48aedff68354181c60a51da2fc09 +++ tests/attr_command_in_subdirs/__driver__.lua 20f2a5abb30a48aedff68354181c60a51da2fc09 @@ -0,0 +1,23 @@ + +mtn_setup() + +mkdir("foo") +mkdir("foo/bar") +writefile("top", "top data") +writefile("foo/foodata", "foo data") +writefile("foo/bar/bardata", "foobar data") + +check(mtn("add", "top", "foo"), 0, false, false) + +-- set attributes in directories + +check(indir("foo", mtn("attr", "set", "foodata", "test:test_attr", "true")), 0, false, false) +check(indir("foo/bar", mtn("attr", "set", "bardata", "test:test_attr", "false")), 0, false, false) +commit() +rev = base_revision() + +-- see if they're right + +check(mtn("checkout", "--revision", rev, "co-dir"), 0, true) +check(qgrep("test:test_attr:foo/foodata:true", "stdout")) +check(qgrep("test:test_attr:foo/bar/bardata:false", "stdout")) ============================================================ --- tests/check_same_db_contents_macro/__driver__.lua cec4d0b7f5781b8f6022176ec4be5a9f234a18dc +++ tests/check_same_db_contents_macro/__driver__.lua cec4d0b7f5781b8f6022176ec4be5a9f234a18dc @@ -0,0 +1,19 @@ + +mtn_setup() + +-- this test just tests that the testsuite macro CHECK_SAME_DB_CONTENTS works, +-- because other tests depend on that. + +addfile("testfile", "blah") +commit("testbranch1") + +addfile("testfile2", "foo") +commit("testbranch2") + +copyfile("test.db", "test2.db") +check_same_db_contents("test.db", "test2.db") + +addfile("testfile3", "pizza") +commit() + +check(not pcall(check_same_db_contents, "test.db", "test2.db")) ============================================================ --- tests/log_hides_deleted_renamed_files/__driver__.lua cd5e5d27ca6488b61b6672a762f313c85e1f05c1 +++ tests/log_hides_deleted_renamed_files/__driver__.lua cd5e5d27ca6488b61b6672a762f313c85e1f05c1 @@ -0,0 +1,39 @@ + +-- This test checks that 'mtn log' of deleted and renamed files shows +-- nothing in a further revision, as they are not applicable any more. + +mtn_setup() + +addfile("foo", "foo") +commit("testbranch", "Addition of foo.") + +addfile("bar", "bar") +commit("testbranch", "Addition of bar.") + +addfile("baz", "baz") +commit("testbranch", "Addition of baz.") + +check(mtn("drop", "bar", "baz"), 0, false, false) +commit() +remove("bar") +remove("baz") + +rename("foo", "bar") +check(mtn("rename", "foo", "bar"), 0, false, false) +commit() + +check(mtn("log", "foo"), 1, 0, false) + +check(mtn("log", "baz"), 1, 0, false) + +check(mtn("log", "bar"), 0, true, false) +rename("stdout", "log") +check(grep("^Addition of [a-z][a-z][a-z].$", "log"), 0, true) +getfile("first") +check(samefile("stdout", "first")) + +check(mtn("log"), 0, true, false) +rename("stdout", "log") +check(grep("^Addition of [a-z][a-z][a-z].$", "log"), 0, true) +getfile("second") +check(samefile("stdout", "second")) ============================================================ --- tests/log_hides_deleted_renamed_files/first 853a3aad88fc43b1a5be36de55f5b3dc9dde46bb +++ tests/log_hides_deleted_renamed_files/first 853a3aad88fc43b1a5be36de55f5b3dc9dde46bb @@ -0,0 +1,1 @@ +Addition of foo. ============================================================ --- tests/log_hides_deleted_renamed_files/second e95e6725d7d2ef8a6ea877ed380c3698ef49e4ed +++ tests/log_hides_deleted_renamed_files/second e95e6725d7d2ef8a6ea877ed380c3698ef49e4ed @@ -0,0 +1,3 @@ +Addition of baz. +Addition of bar. +Addition of foo. ============================================================ --- tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua 0fbb2ea669d060ce7588816d64101ede8e567334 +++ tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua 0fbb2ea669d060ce7588816d64101ede8e567334 @@ -0,0 +1,31 @@ + +mtn_setup() + +writefile("v1a", "foo blah") +writefile("v1b", "bar blah") +writefile("v2a", "baz blah") + +copyfile("v1a", "testfile") +check(mtn("add", "testfile"), 0, false, false) +addfile("renamefile", "this will be overwritten") +check(mtn("add", "renamefile"), 0, false, false) +commit() +base = base_revision() + +remove("testfile") +check(mtn("drop", "testfile"), 0, false, false) +check(mtn("rename", "renamefile", "testfile"), 0, false, false) +rename("renamefile", "testfile") +commit() + +copyfile("v2a", "testfile") +commit() + +revert_to(base) + +addfile("otherfile", "this space for rent") +commit() + +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) +check(samefile("testfile", "v2a")) ============================================================ --- tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua 3c8d9c94096b94a42aa6cc6d89d0a351b404e207 +++ tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua 3c8d9c94096b94a42aa6cc6d89d0a351b404e207 @@ -0,0 +1,25 @@ + +mtn_setup() + +mkdir("foo") +addfile("foo/a", "blah blah") +commit() +base = base_revision() + +rename("foo", "bar") +check(mtn("rename", "foo", "bar"), 0, false, false) +commit() + +rename("bar", "foo") +revert_to(base) +writefile("foo/a", "some other stuff") +commit() + +check(mtn("--branch=testbranch", "merge"), 0, false, false) + +check(mtn("checkout", "--revision", base, "test_dir"), 0, false, false) +check(indir("test_dir", mtn("update", "--branch=testbranch")), 0, false, false) + +check(not exists("test_dir/foo/a")) +check(exists("test_dir/bar/a")) +check(samefile("foo/a", "test_dir/bar/a")) ============================================================ --- tests/merge((rename_a_b),_(rename_a_c))/__driver__.lua 9321316dd8f07d73f429075d838059da35587abb +++ tests/merge((rename_a_b),_(rename_a_c))/__driver__.lua 9321316dd8f07d73f429075d838059da35587abb @@ -0,0 +1,21 @@ + +mtn_setup() + +-- Should cause a merge conflict. + +addfile("a", "blah blah") +commit() +base = base_revision() + +rename("a", "b") +check(mtn("rename", "a", "b"), 0, false, false) +commit() + +rename("b", "a") +revert_to(base) + +rename("a", "c") +check(mtn("rename", "a", "c"), 0, false, false) +commit() + +check(mtn("merge", "--branch=testbranch"), 1, false, false) ============================================================ --- tests/merge_rev_with_ancestor/__driver__.lua 7a11b3b2570698ef3120a296899ed9876d0b7720 +++ tests/merge_rev_with_ancestor/__driver__.lua 7a11b3b2570698ef3120a296899ed9876d0b7720 @@ -0,0 +1,21 @@ + +mtn_setup() + +-- The idea here is that if we have, say, A -> B -> C, then merging A +-- and C should not be possible, because it creates a weird graph with +-- no clear meaning. + +addfile("testfile", "0") +commit() +r0 = base_revision() + +writefile("testfile", "1") +commit() +r1 = base_revision() + +writefile("testfile", "2") +commit() +r2 = base_revision() + +check(mtn("explicit_merge", r0, r1, "testbranch"), 1, false, false) +check(mtn("explicit_merge", r1, r0, "testbranch"), 1, false, false) ============================================================ --- tests/merge_with_add,_rename_file,_and_rename_dir/__driver__.lua 66db7642587c0226a690e745d3cafcc44293c4e5 +++ tests/merge_with_add,_rename_file,_and_rename_dir/__driver__.lua 66db7642587c0226a690e745d3cafcc44293c4e5 @@ -0,0 +1,65 @@ + +mtn_setup() + +-- This one's kind of complicated. +-- +-- base - contains directory foo +-- | \ +-- | \ +-- | rename_dir - rename_dir foo bar +-- | | +-- added | - add_file foo/a +-- | \ | +-- | \ | +-- | \ | +-- | merge 1 +-- | | +-- rename_file | - rename_file foo/a bar/a +-- \ | +-- \ | +-- test +-- +-- we want to make sure that both merges happen without tree conflicts +-- being triggered + +revs = {} + +mkdir("foo") +addfile("foo/bystander", "data data") +commit() +revs.base = base_revision() + +check(mtn("rename", "foo/", "bar/"), 0, false, false) +rename("foo", "bar") +commit() +revs.rename_dir = base_revision() + +revert_to(revs.base) + +addfile("foo/a", "more data") +commit() +revs.added = base_revision() + +check(mtn("merge"), 0, false, false) + +rename("foo/a", "foo/b") +check(mtn("rename", "foo/a", "foo/b"), 0, false, false) +commit() +revs.rename_file = base_revision() + +check(mtn("merge"), 0, false, false) + +check(mtn("checkout", "--revision", revs.base, "test_dir"), 0, false, false) +check(indir("test_dir", mtn("update", "--branch=testbranch")), 0, false, false) +revs.test = indir("test_dir", base_revision)() + +for _,x in pairs{"base", "rename_dir", "added", "rename_file"} do + check(revs.test ~= revs[x]) +end + +check(not exists("test_dir/foo/bystander")) +check(exists("test_dir/bar/bystander")) +check(not exists("test_dir/foo/a")) +check(not exists("test_dir/bar/a")) +check(not exists("test_dir/foo/b")) +check(exists("test_dir/bar/b")) ============================================================ --- tests/propagate_a_descendent/__driver__.lua 4e0c0d2b067b011a061e290db194b6a5c60d58cf +++ tests/propagate_a_descendent/__driver__.lua 4e0c0d2b067b011a061e290db194b6a5c60d58cf @@ -0,0 +1,29 @@ + +mtn_setup() + +-- This tests the case where we have something like A1 -> A2 -> B1 -> +-- B2, where A and B are different branches, and the user propagates B +-- to A. The result should be B2 being certed into branch A, with no +-- merge performed. + +heads = {} + +addfile("testfile", "foo") +commit("a") + +writefile("testfile", "bar") +commit("a") +heads.a = base_revision() + +writefile("testfile", "baz") +commit("b") + +writefile("testfile", "quux") +commit("b") +heads.b = base_revision() + +check(mtn("propagate", "b", "a"), 0, false, false) +check(mtn("heads", "--branch=b"), 0, true, false) +check(qgrep(heads.b, "stdout")) +check(mtn("heads", "--branch=a"), 0, true, false) +check(qgrep(heads.b, "stdout")) ============================================================ --- tests/propagate_an_ancestor/__driver__.lua 9e3fc70664c1d7c917171fd9e2ddaf40e7e1a888 +++ tests/propagate_an_ancestor/__driver__.lua 9e3fc70664c1d7c917171fd9e2ddaf40e7e1a888 @@ -0,0 +1,35 @@ + +mtn_setup() + +-- This tests the case where we have something like A1 -> A2 -> B1 -> +-- B2, where A and B are different branches, and the user propagates A +-- to B. This should be a no-op; no merge should be performed. + +-- The same applies when the heads of A and B are actually equal. + +heads = {} + +addfile("testfile", "foo") +commit("a") + +writefile("testfile", "bar") +commit("a") +heads.a = base_revision() + +writefile("testfile", "baz") +commit("b") + +writefile("testfile", "quux") +commit("b") +heads.b = base_revision() + +copyfile("test.db", "test2.db") +check(mtn("propagate", "a", "b"), 0, false, false) + +check_same_db_contents("test.db", "test2.db") + +check(mtn("cert", heads.b, "branch", "c"), 0, false, false) +copyfile("test.db", "test3.db") +check(mtn("propagate", "b", "c"), 0, false, false) + +check_same_db_contents("test.db", "test3.db") ============================================================ --- tests/pull_a_netsync_branch_which_has_a_parent_from_another_branch/__driver__.lua 39e7147a85425a27ab720a1dee7f120f55dcc831 +++ tests/pull_a_netsync_branch_which_has_a_parent_from_another_branch/__driver__.lua 39e7147a85425a27ab720a1dee7f120f55dcc831 @@ -0,0 +1,16 @@ + +mtn_setup() +netsync.setup() + +addfile("testfile", "blah stuff") +commit() +ver0 = base_revision() + +addfile("testfile2", "some more data") +commit("otherbranch") +ver1 = base_revision() + +netsync.pull("otherbranch") + +check_same_stdout(mtn("ls", "certs", ver1), + mtn2("ls", "certs", ver1)) ============================================================ --- tests/rename_dir_to_non-sibling/__driver__.lua f8dc21e12ae8f3b34d21cd9aa35a0b963fb9f9a4 +++ tests/rename_dir_to_non-sibling/__driver__.lua f8dc21e12ae8f3b34d21cd9aa35a0b963fb9f9a4 @@ -0,0 +1,70 @@ + +mtn_setup() + +-- Pretty rigorous test of rename_dir, in particular when the target +-- and source of the rename are not sibling directories. + +old_dir = "subdir1/the_dir" +new_dir = "subdir2/target_dir/the_dir" + +mkdir("subdir1") +mkdir(old_dir) +mkdir("subdir2") +mkdir("subdir2/target_dir") + +addfile(old_dir .. "/preexisting", "foo bar blah") +addfile(old_dir .. "/rename-out-file", "asdfasdf") +mkdir(old_dir .. "/rename-out-dir") +addfile(old_dir .. "/rename-out-dir/subfile", "9") +addfile("rename-in-file", "badlsakl") +mkdir("rename-in-dir") +addfile("rename-in-dir/subfile", "10") +addfile(old_dir .. "/doomed", "badfsda") +addfile("subdir1/bystander1", "stuff stuff") +commit() +base = base_revision() + +addfile("subdir1/bystander2", "asdfasknb") +addfile(old_dir .. "/new-file", "foo ping") +check(mtn("rename", old_dir .. "/rename-out-file", "rename-out-file"), 0, false, false) +rename(old_dir .. "/rename-out-file", "rename-out-file") +check(mtn("rename", old_dir .. "/rename-out-dir", "rename-out-dir"), 0, false, false) +rename(old_dir .. "/rename-out-dir", "rename-out-dir") +check(mtn("rename", "rename-in-dir", old_dir .. "/rename-in-dir"), 0, false, false) +rename("rename-in-dir", old_dir .. "/rename-in-dir") +check(mtn("rename", "rename-in-file", old_dir .. "/rename-in-file"), 0, false, false) +rename("rename-in-file", old_dir .. "/rename-in-file") +check(mtn("drop", old_dir .. "/doomed"), 0, false, false) +commit() +left = base_revision() + +revert_to(base) + +check(mtn("rename", old_dir, new_dir), 0, false, false) +rename(old_dir, new_dir) +commit() +right = base_revision() + +check(mtn("merge", "--branch=testbranch"), 0, false, false) + +check(mtn("checkout", "--revision", base, "test_dir"), 0, false, false) +check(indir("test_dir", mtn("--branch=testbranch", "update")), 0, false, false) +merged = indir("test_dir", base_revision)() +check(base ~= merged) +check(left ~= merged) +check(right ~= merged) + +t_new_dir = "test_dir/" .. new_dir +check(samefile(new_dir .. "/preexisting", t_new_dir .. "/preexisting")) +check(samefile(new_dir .. "/new-file", t_new_dir .. "/new-file")) +check(samefile("rename-out-file", "test_dir/rename-out-file")) +check(not exists(t_new_dir .. "/rename-out-file")) +check(samefile("rename-out-dir/subfile", "test_dir/rename-out-dir/subfile")) +check(not exists(t_new_dir .. "/rename-out-dir/subfile")) +check(samefile(new_dir .. "/rename-in-file", t_new_dir .. "/rename-in-file")) +check(not exists("test_dir/rename-in-file")) +check(samefile(new_dir .. "/rename-in-dir/subfile", t_new_dir .. "/rename-in-dir/subfile")) +check(not exists("test_dir/rename-in-dir/subfile")) +check(not exists(t_new_dir .. "/doomed")) +check(samefile("subdir1/bystander1", "test_dir/subdir1/bystander1")) +check(samefile("subdir1/bystander2", "test_dir/subdir1/bystander2")) ============================================================ --- tests/rename_in_subdir/__driver__.lua d9d851ec083f3270f258c477ee7eaef3c0e9530a +++ tests/rename_in_subdir/__driver__.lua d9d851ec083f3270f258c477ee7eaef3c0e9530a @@ -0,0 +1,23 @@ + +mtn_setup() + +mkdir("subdir") +mkdir("subdir/anotherdir") +writefile("subdir/foo", "data data") +writefile("subdir/anotherdir/bar", "more data") +check(mtn("add", "."), 0, false, false) +commit() + rev = base_revision() + +rename("subdir/foo", "subdir/foo-renamed") +check(indir("subdir", mtn("rename", "foo", "foo-renamed")), 0, false, false) +rename("subdir/anotherdir", "anotherdir-renamed") +check(indir("subdir", mtn("rename", "anotherdir", "../anotherdir-renamed")), 0, false, false) +commit() + +check(mtn("checkout", "--revision", rev, "codir"), 0, false, false) +check(indir("codir", mtn("update", "--branch=testbranch")), 0, false, false) +check(not exists("codir/subdir/foo")) +check(not exists("codir/subdir/anotherdir/bar")) +check(samefile("subdir/foo-renamed", "codir/subdir/foo-renamed")) +check(samefile("anotherdir-renamed/bar", "codir/anotherdir-renamed/bar")) ============================================================ --- tests/revert_in_subdirs/__driver__.lua be726716d4ab49c14ce77b1d03abbcbe3e4ef76d +++ tests/revert_in_subdirs/__driver__.lua be726716d4ab49c14ce77b1d03abbcbe3e4ef76d @@ -0,0 +1,27 @@ + +mtn_setup() + +mkdir("subdir") +mkdir("subdir/anotherdir") +writefile("subdir/foo", "data data") +writefile("subdir/anotherdir/bar", "more data") +check(mtn("add", "."), 0, false, false) +commit() +rev = base_revision() + +-- Create a checkout we can play with +check(mtn("checkout", "--revision", rev, "codir"), 0, false, false) + +-- Write to the checked out files +writefile("codir/subdir/foo", "other data") +writefile("codir/subdir/anotherdir/bar", "more other data") + +-- Revert them +chdir("codir/subdir") +check(mtn("revert", "foo"), 0, false, false) +check(mtn("revert", "anotherdir"), 0, false, false) +chdir("../..") + +-- Check them +check(samefile("subdir/foo", "codir/subdir/foo")) +check(samefile("subdir/anotherdir/bar", "codir/subdir/anotherdir/bar")) ============================================================ --- tests/status_with_missing_files/__driver__.lua 715149ce1c5c941ca4e1344d53b0dd690d13fac8 +++ tests/status_with_missing_files/__driver__.lua 715149ce1c5c941ca4e1344d53b0dd690d13fac8 @@ -0,0 +1,20 @@ + +mtn_setup() + +addfile("testfile1", "foo") +addfile("testfile2", "bar") +commit() + +remove("testfile1") +remove("testfile2") + +-- status should successfully report on the status of things regardless +-- of the status of those things -- i.e. it should report missing files +-- as such rather than failing on them. + +-- status should list all missing files before failing +-- if/when there are missing files + +check(mtn("status"), 1, false, true) +check(qgrep("testfile1", "stderr")) +check(qgrep("testfile2", "stderr")) ============================================================ --- tests/update_1/__driver__.lua a54dcea9e22857d2e21d5e7f5a55961482d959e9 +++ tests/update_1/__driver__.lua a54dcea9e22857d2e21d5e7f5a55961482d959e9 @@ -0,0 +1,28 @@ + +mtn_setup() + +-- We have A1 -> B1, A and B different branches. Update from A1 +-- shouldn't take us to B1. Then propagate B -> A, and update from A1; +-- now this should take us to B1. + +addfile("testfile", "stuff stuff") +commit("a") +a1 = base_revision() + +writefile("testfile", "nonsense nonsense") +commit("b") +b1 = base_revision() + +revert_to(a1) +-- Put in an explicit --branch, because REVERT_TO is not smart about +-- such things. +check(mtn("--branch=a", "update"), 0, false, false) +check(a1 == base_revision()) + +check(mtn("propagate", "b", "a"), 0, false, false) + +revert_to(a1) +-- Put in an explicit --branch, because REVERT_TO is not smart about +-- such things. +check(mtn("--branch=a", "update"), 0, false, false) +check(b1 == base_revision()) ============================================================ --- tests/verification_of_command_line_options/__driver__.lua acb107efa511a9e99eda01333c5f2d3c5b712925 +++ tests/verification_of_command_line_options/__driver__.lua acb107efa511a9e99eda01333c5f2d3c5b712925 @@ -0,0 +1,9 @@ + +mtn_setup() + +check(mtn(), 2, false, false) +check(mtn("--norc"), 2, false, false) +check(mtn("--rcfile=test_hooks.lua"), 2, false, false) + +check(mtn("--unknown-option"), 1, false, false) +check(mtn("--rcfile"), 1, false, false) ============================================================ --- tester.cc d40ade4fec88a65942ab694afca516330a65b639 +++ tester.cc 01ceaa6974040125059f3d96204399ef8faa3103 @@ -255,6 +255,7 @@ go_to_dir(lua_State * L) { fs::path dir(luaL_checkstring(L, -1), fs::native); + string from = fs::current_path().native_file_string(); if (!dir.is_complete()) dir = fs::current_path() / dir; if (!fs::exists(dir) || !fs::is_directory(dir)) @@ -263,7 +264,7 @@ return 1; } go_to_workspace(dir.native_file_string()); - lua_pushboolean(L, true); + lua_pushstring(L, from.c_str()); return 1; } ============================================================ --- tester.lua c8a5857dde20aefa3c26de1680bf0cb7679e0937 +++ tester.lua 92bd519bdfaca67c77c6db0acd7ea042c59507f8 @@ -223,9 +223,16 @@ end function cmd(first, ...) + local args = arg + if type(first) == "table" then + args = first + first = args[1] + table.remove(args, 1) + end + if type(first) == "string" then - L(locheader(), first, " ", table.concat(arg, " "), "\n") - return function () return execute(first, unpack(arg)) end + L(locheader(), first, " ", table.concat(args, " "), "\n") + return function () return execute(first, unpack(args)) end elseif type(first) == "function" then local info = debug.getinfo(first) local name @@ -234,8 +241,8 @@ else name = "" end - L(locheader(), name, " ", table.concat(arg, " "), "\n") - return function () return first(unpack(arg)) end + L(locheader(), name, " ", table.concat(args, " "), "\n") + return function () return first(unpack(args)) end else error("cmd() called with argument of unknown type " .. type(first), 2) end @@ -281,7 +288,7 @@ end return out end - return dogrep, unpack(arg) + return {dogrep, unpack(arg)} end function log_file_contents(filename) @@ -409,8 +416,25 @@ return result end +function indir(dir, what) + local function do_indir() + if type(what) == "table" then what = cmd(what) end + if type(what) ~= "function" then + err("bad argument of type "..type(what).." to indir()") + end + local savedir = chdir(dir) + local ok, res = pcall(what) + chdir(savedir) + if not ok then err(res) end + return res + end + return do_indir +end + function check(first, ...) - if type(first) == "function" then + if type(first) == "table" then + return check_func(cmd(first), unpack(arg)) + elseif type(first) == "function" then return check_func(first, unpack(arg)) elseif type(first) == "boolean" then if not first then err("Check failed: false", 2) end @@ -504,8 +528,8 @@ if i < 100 then P(" ") end if i < 10 then P(" ") end - P(i .. " " .. shortname) - local spacelen = 46 - string.len(shortname) + P(i, " ", shortname, " ") + local spacelen = 45 - string.len(shortname) local spaces = string.rep(" ", 50) if spacelen > 0 then P(string.sub(spaces, 1, spacelen)) end ============================================================ --- tests/'heads'/__driver__.lua e9946a22ae4f0ad372209105d2a59b06dce00623 +++ tests/'heads'/__driver__.lua 8e365adecc55f93d4c2ef80be9604e50c4063600 @@ -13,7 +13,7 @@ commit("branch1") revs.root = base_revision() -check(cmd(mtn("--branch=branch1", "heads")), 0, true, false) +check(mtn("--branch=branch1", "heads"), 0, true, false) check(qgrep(revs.root, "stdout")) -- Create a child @@ -28,7 +28,7 @@ commit("branch1") revs.child1 = base_revision() -check(cmd(mtn("--branch=branch1", "heads")), 0, true, false) +check(mtn("--branch=branch1", "heads"), 0, true, false) check(not qgrep(revs.root, "stdout")) check(qgrep(revs.child1, "stdout")) @@ -45,7 +45,7 @@ commit("branch1") revs.child2 = base_revision() -check(cmd(mtn("--branch=branch1", "heads")), 0, true, false) +check(mtn("--branch=branch1", "heads"), 0, true, false) check(not qgrep(revs.root, "stdout")) check(qgrep(revs.child1, "stdout")) check(qgrep(revs.child2, "stdout")) @@ -65,12 +65,12 @@ commit("branch2") revs.child3 = base_revision() -check(cmd(mtn("--branch=branch1", "heads")), 0, true, false) +check(mtn("--branch=branch1", "heads"), 0, true, false) check(not qgrep(revs.root, "stdout")) check(qgrep(revs.child1, "stdout")) check(qgrep(revs.child2, "stdout")) check(not qgrep(revs.child3, "stdout")) -check(cmd(mtn("--branch=branch2", "heads")), 0, true, false) +check(mtn("--branch=branch2", "heads"), 0, true, false) check(not qgrep(revs.root, "stdout")) check(not qgrep(revs.child1, "stdout")) check(not qgrep(revs.child2, "stdout")) @@ -92,13 +92,13 @@ commit("branch2") revs.child4 = base_revision() -check(cmd(mtn("--branch=branch1", "heads")), 0, true, false) +check(mtn("--branch=branch1", "heads"), 0, true, false) check(not qgrep(revs.root, "stdout")) check(qgrep(revs.child1, "stdout")) check(qgrep(revs.child2, "stdout")) check(not qgrep(revs.child3, "stdout")) check(not qgrep(revs.child4, "stdout")) -check(cmd(mtn("--branch=branch2", "heads")), 0, true, false) +check(mtn("--branch=branch2", "heads"), 0, true, false) check(not qgrep(revs.root, "stdout")) check(not qgrep(revs.child1, "stdout")) check(not qgrep(revs.child2, "stdout")) ============================================================ --- tests/'heads'_with_discontinuous_branches/__driver__.lua 7059df07d5993350e3d1e1d66441c4a239bf2365 +++ tests/'heads'_with_discontinuous_branches/__driver__.lua 9d517a63e2ab2a0d66cbc170d06b04264ed1e0b8 @@ -15,12 +15,12 @@ -- Create R1 writefile("f", "r1 data") -check(cmd(mtn("add", "f")), 0, false, false) +check(mtn("add", "f"), 0, false, false) commit("branch1") revs[1] = base_revision() -- Sanity check first... -check(cmd(mtn("--branch=branch1", "heads")), 0, true, false) +check(mtn("--branch=branch1", "heads"), 0, true, false) check(qgrep(revs[1], "stdout")) -- Now create R2 @@ -34,7 +34,7 @@ revs[3] = base_revision() -- Now check heads on branch1 -check(cmd(mtn("--branch=branch1", "heads")), 0, true, false) +check(mtn("--branch=branch1", "heads"), 0, true, false) check(not qgrep(revs[1], "stdout")) check(not qgrep(revs[2], "stdout")) check(qgrep(revs[3], "stdout")) ============================================================ --- tests/(imp)_deleting_directories/__driver__.lua 0d3603c80d9a1a050583306a4518952ae46f3422 +++ tests/(imp)_deleting_directories/__driver__.lua 1647676a62a47c09d1e343614b53860c7d588516 @@ -15,10 +15,10 @@ addfile("bystander2", "6") addfile("groundzero/new-file", "7") rename("rename-in", "groundzero/rename-in") -check(cmd(mtn("rename", "rename-in", "groundzero/rename-in")), 0, false, false) +check(mtn("rename", "rename-in", "groundzero/rename-in"), 0, false, false) rename("groundzero/rename-out", "rename-out") -check(cmd(mtn("rename", "groundzero/rename-out", "rename-out")), 0, false, false) -check(cmd(mtn("drop", "-e", "groundzero/double-kill")), 0, false, false) +check(mtn("rename", "groundzero/rename-out", "rename-out"), 0, false, false) +check(mtn("drop", "-e", "groundzero/double-kill"), 0, false, false) commit() revs.other = base_revision() @@ -28,25 +28,25 @@ remove("groundzero/rename-in") remove("groundzero/new-file") -check(cmd(mtn("drop", "-e", "groundzero")), 1, false, false) -check(cmd(mtn("drop", "--recursive", "-e", "groundzero")), 0, false, false) +check(mtn("drop", "-e", "groundzero"), 1, false, false) +check(mtn("drop", "--recursive", "-e", "groundzero"), 0, false, false) commit() revs.dir_del = base_revision() -- orphaned node conflicts on rename-in and new-file -check(cmd(mtn("merge")), 1, false, false) +check(mtn("merge"), 1, false, false) -check(cmd(mtn("update", "-r", revs.other)), 0, false, false) -check(cmd(mtn("drop", "groundzero/new-file")), 0, false, false) -check(cmd(mtn("drop", "groundzero/rename-in")), 0, false, false) +check(mtn("update", "-r", revs.other), 0, false, false) +check(mtn("drop", "groundzero/new-file"), 0, false, false) +check(mtn("drop", "groundzero/rename-in"), 0, false, false) commit() -check(cmd(mtn("merge")), 0, false, false) +check(mtn("merge"), 0, false, false) -check(cmd(mtn("checkout", "--revision", revs.base, "clean")), 0, false, false) +check(mtn("checkout", "--revision", revs.base, "clean"), 0, false, false) chdir("clean") -check(cmd(mtn("--branch=testbranch", "update")), 0, false, false) +check(mtn("--branch=testbranch", "update"), 0, false, false) chdir("..") check(not exists("clean/rename-out")) ============================================================ --- tests/(minor)_update_cleans_emptied_directories/__driver__.lua 41b21eae0ae20ea501388ca9c1a90710ea5cf501 +++ tests/(minor)_update_cleans_emptied_directories/__driver__.lua 6d91c357804f5a45addd1df316ec080e958af5e9 @@ -7,13 +7,13 @@ base = base_revision() remove_recursive("testdir") -check(cmd(mtn("drop", "testdir/foo", "testdir")), 0, false, false) +check(mtn("drop", "testdir/foo", "testdir"), 0, false, false) commit() revert_to(base) check(exists("testdir")) -check(cmd(mtn("update")), 0, false, false) +check(mtn("update"), 0, false, false) check(base ~= base_revision()) ============================================================ --- tests/(normal)_netsync_on_partially_unrelated_revisions/__driver__.lua ba7f6002567f543835f899351d0b9ccc657302f8 +++ tests/(normal)_netsync_on_partially_unrelated_revisions/__driver__.lua e4a38f668b917cbecbfd6f57c58e4e74e9b49bb9 @@ -26,24 +26,24 @@ netsync.pull("testbranch") for _,i in pairs{{"automate", "graph"}, {"ls", "certs", base}} do - check_same_stdout(cmd(mtn(unpack(i))), cmd(mtn2(unpack(i)))) + check_same_stdout(mtn(unpack(i)), mtn2(unpack(i))) end remove_recursive("_MTN") -check(cmd(mtn("setup", "--branch=testbranch", ".")), 0, false, false) +check(mtn("setup", "--branch=testbranch", "."), 0, false, false) addfile("testfile2", "This is test file 2") commit("testbranch") unrelated = base_revision() -xfail_if(true, cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +xfail_if(true, mtn("--branch=testbranch", "merge"), 0, false, false) +check(mtn("update"), 0, false, false) merge = base_revision() netsync.pull("testbranch") -check_same_stdout(cmd(mtn("automate", "graph")), cmd(mtn2("automate", "graph"))) +check_same_stdout(mtn("automate", "graph"), mtn2("automate", "graph")) for _,i in pairs{base, unrelated, merge} do - check_same_stdout(cmd(mtn("ls", "certs", i)), - cmd(mtn2("ls", "certs", i))) + check_same_stdout(mtn("ls", "certs", i), + mtn2("ls", "certs", i)) end ============================================================ --- tests/--rcfile_requires_extant_file/__driver__.lua 879ac16a69e9c3bea190bbcc525cb58d977d91e9 +++ tests/--rcfile_requires_extant_file/__driver__.lua 08faec0b56f2821dc211a9b1c7deb3578cf218e9 @@ -1,6 +1,6 @@ mtn_setup() -- rcfiles may contain security settings. So make it a hard error if -- the user typoes or somesuch. +check(mtn("--rcfile=no-such-file", "status"), 1, false, false) -check(cmd(mtn("--rcfile=no-such-file", "status")), 1, false, false) ============================================================ --- tests/add_and_then_drop_file_does_nothing/__driver__.lua ed74475c0927b2c9c47ab97388d3460fdfd3fe07 +++ tests/add_and_then_drop_file_does_nothing/__driver__.lua 6f0ad37e82016507c3da274fcd361db3569cd4af @@ -1,12 +1,12 @@ mtn_setup() addfile("maude", "the file maude\n") -check(cmd(mtn("drop", "maude")), 0, false, false) -check(cmd(mtn("status")), 0, true) +check(mtn("drop", "maude"), 0, false, false) +check(mtn("status"), 0, true) check(not qgrep("_file", "stdout")) addfile("liver", "the file liver\n") -check(cmd(mtn("drop", "liver")), 0, false, false) -check(cmd(mtn("status")), 0, true) +check(mtn("drop", "liver"), 0, false, false) +check(mtn("status"), 0, true) check(not qgrep("_file", "stdout")) ============================================================ --- tests/addition_of_files_and_directories/__driver__.lua 122cd653d6207b86b5af26699414ae3c3e4b8bce +++ tests/addition_of_files_and_directories/__driver__.lua 918c1b3bd41fa3f9c4e67e64255221431e2481db @@ -8,18 +8,18 @@ -- adding a non-existent file should fail -check(cmd(mtn("add", "foobar")), 1, false, false) +check(mtn("add", "foobar"), 1, false, false) -- newly added files should appear as such -check(cmd(mtn("add", "file0")), 0, false, true) +check(mtn("add", "file0"), 0, false, true) check(qgrep("adding file0", "stderr")) -check(cmd(mtn("add", "dir")), 0, false, true) +check(mtn("add", "dir"), 0, false, true) check(qgrep("adding dir/file1", "stderr")) check(qgrep("adding dir/file2", "stderr")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("file0", "stdout")) check(qgrep("file1", "stdout")) check(qgrep("file2", "stdout")) @@ -29,14 +29,14 @@ -- redundant additions should not appear -- (i.e. they should be ignored) -check(cmd(mtn("add", "file0")), 0, false, true) +check(mtn("add", "file0"), 0, false, true) check(qgrep("skipping file0", "stderr")) -check(cmd(mtn("add", "dir")), 0, false, true) +check(mtn("add", "dir"), 0, false, true) check(qgrep("skipping dir/file1", "stderr")) check(qgrep("skipping dir/file2", "stderr")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(not qgrep("file0", "stdout")) check(not qgrep("file1", "stdout")) check(not qgrep("file2", "stdout")) @@ -51,9 +51,9 @@ writefile("dir2/file7", "file 7\n") --writefile(".mtn-ignore", ".*\\.ignore$\n") ---check(cmd(raw_mtn("ls", "unkown")), 0, true, false) +--check(raw_mtn("ls", "unkown"), 0, true, false) -check(cmd(mtn("add", "--unknown")), 0, false, true) +check(mtn("add", "--unknown"), 0, false, true) check(qgrep('adding file3', "stderr")) --check(not qgrep('adding file4.ignore', "stderr")) check(qgrep('adding dir/file5', "stderr")) @@ -63,7 +63,7 @@ check(not qgrep('skipping dir2/file7', "stderr")) check(not qgrep('adding test_hooks.lua', "stderr")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(not qgrep("file0", "stdout")) check(not qgrep("file1", "stdout")) check(not qgrep("file2", "stdout")) @@ -74,7 +74,7 @@ commit() -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(not qgrep("file0", "stdout")) check(not qgrep("file1", "stdout")) check(not qgrep("file2", "stdout")) ============================================================ --- tests/attr_set_attr_get/__driver__.lua d13140261712c3842a400760b3d831253f15bec2 +++ tests/attr_set_attr_get/__driver__.lua 3f79c421ec71d9f91892cdf4e8824d6de6d2c5ec @@ -1,12 +1,12 @@ mtn_setup() addfile("testfile", "foo bar") -check(cmd(mtn("attr", "set", "testfile", "test:unique_key", "unique_value")), 0, false, false) -check(cmd(mtn("attr", "get", "testfile")), 0, true, false) +check(mtn("attr", "set", "testfile", "test:unique_key", "unique_value"), 0, false, false) +check(mtn("attr", "get", "testfile"), 0, true, false) check(qgrep("test:unique_key", "stdout")) check(qgrep("unique_value", "stdout")) -check(cmd(mtn("attr", "get", "testfile", "test:unique_key")), 0, true, false) +check(mtn("attr", "get", "testfile", "test:unique_key"), 0, true, false) check(qgrep("unique_value", "stdout")) commit() ============================================================ --- tests/attr_set_get_commands/__driver__.lua cf3184ab7f485cc0d78eaa56315354f88b280494 +++ tests/attr_set_get_commands/__driver__.lua 5fa53a0df58c2faed1ba6d76646e39f6a62c0318 @@ -5,29 +5,29 @@ -- Check a single character filename too, because those have had bugs. writefile("a", "some data") -check(cmd(mtn("add", "foo")), 0, false, false) -check(cmd(mtn("add", "a")), 0, false, false) -check(cmd(mtn("attr", "set", "foo", "test:test_attr", "true")), 0, false, false) -check(cmd(mtn("attr", "set", "a", "test:test_attr", "1")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) +check(mtn("add", "a"), 0, false, false) +check(mtn("attr", "set", "foo", "test:test_attr", "true"), 0, false, false) +check(mtn("attr", "set", "a", "test:test_attr", "1"), 0, false, false) commit() co_r_sha1 = base_revision() -check(cmd(mtn("attr", "drop", "foo", "test:test_attr")), 0, false, false) -check(cmd(mtn("attr", "set", "a", "test:test_attr", "2")), 0, false, false) +check(mtn("attr", "drop", "foo", "test:test_attr"), 0, false, false) +check(mtn("attr", "set", "a", "test:test_attr", "2"), 0, false, false) commit() update_r_sha1 = base_revision() -- Check checkouts. remove_recursive("co-dir") -check(cmd(mtn("checkout", "--revision", co_r_sha1, "co-dir")), 0, true) +check(mtn("checkout", "--revision", co_r_sha1, "co-dir"), 0, true) check(qgrep("test:test_attr:foo:true", "stdout")) check(qgrep("test:test_attr:a:1", "stdout")) -- Check updates. remove_recursive("co-dir") -check(cmd(mtn("checkout", "--revision", update_r_sha1, "co-dir")), 0, true) +check(mtn("checkout", "--revision", update_r_sha1, "co-dir"), 0, true) check(not qgrep("test:test_attr:foo", "stdout")) check(qgrep("test:test_attr:a:2", "stdout")) -- check that files must exist to have attributes set +check(mtn("attr", "set", "missing", "mtn:execute"), 1, false, false) -check(cmd(mtn("attr", "set", "missing", "mtn:execute")), 1, false, false) ============================================================ --- tests/basic_invocation_and_options/__driver__.lua 2f5545530879be900feceb93e3434485202e8137 +++ tests/basic_invocation_and_options/__driver__.lua 9f5fde123d08c98d315fd296942c7da7f256fe85 @@ -1,14 +1,14 @@ mtn_setup() +check(raw_mtn("--norc"), 2, false) +check(raw_mtn("--help"), 2, false) +check(raw_mtn("--version"), 0, false) +check(raw_mtn("--nostd", "--help"), 2, false) +check(raw_mtn("--norc", "--help"), 2, false) +check(raw_mtn("--debug", "--help"), 2, false, false) +check(raw_mtn("--quiet", "--help"), 2, false) +check(raw_mtn("--db=foo.db", "--help"), 2, false) +check(raw_mtn("--db", "foo.db", "--help"), 2, false) +check(raw_mtn("address@hidden", "--help"), 2, false) +check(raw_mtn("--key", "address@hidden", "--help"), 2, false) -check(cmd(raw_mtn("--norc")), 2, false) -check(cmd(raw_mtn("--help")), 2, false) -check(cmd(raw_mtn("--version")), 0, false) -check(cmd(raw_mtn("--nostd", "--help")), 2, false) -check(cmd(raw_mtn("--norc", "--help")), 2, false) -check(cmd(raw_mtn("--debug", "--help")), 2, false, false) -check(cmd(raw_mtn("--quiet", "--help")), 2, false) -check(cmd(raw_mtn("--db=foo.db", "--help")), 2, false) -check(cmd(raw_mtn("--db", "foo.db", "--help")), 2, false) -check(cmd(raw_mtn("address@hidden", "--help")), 2, false) -check(cmd(raw_mtn("--key", "address@hidden", "--help")), 2, false) ============================================================ --- tests/calculation_of_other_unidiffs/__driver__.lua 3e252f3773737b1c3732d31bd555019b1ef78d53 +++ tests/calculation_of_other_unidiffs/__driver__.lua 8ef9ea4938ad4817028e9193a82405b544eedcb7 @@ -11,7 +11,7 @@ -- calculate diff to second file using monotone getfile("secondfile", "testfile") -check(cmd(mtn("diff")), 0, true) +check(mtn("diff"), 0, true) os.rename("stdout", "monodiff") -- look for a meaningless change ============================================================ --- tests/calculation_of_unidiffs/__driver__.lua dc4049addaabebcced1d345d174db4e7abcaa7e1 +++ tests/calculation_of_unidiffs/__driver__.lua 7f47ccd3bd189c2eaca4ae5126635032509195ab @@ -5,7 +5,7 @@ -- get first file and commit to db getfile("firstfile", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() rename("testfile", "firstfile") @@ -13,7 +13,7 @@ getfile("secondfile", "testfile") -- calculate diff to second file using monotone -check(cmd(mtn("diff")), 0, true) +check(mtn("diff"), 0, true) canonicalize("stdout") rename("stdout", "monodiff") rename("testfile", "secondfile") ============================================================ --- tests/changing_passphrase_of_a_private_key/__driver__.lua 07157ac02b192bf7f97b7c19f8398a6811007769 +++ tests/changing_passphrase_of_a_private_key/__driver__.lua ef0c7331465d50066cb1eac75271046fb6523030 @@ -1,22 +1,22 @@ mtn_setup() tkey = "address@hidden" -- generate a new key -check(cmd(mtn("genkey", tkey)), 0, false, false, string.rep(tkey.."\n", 2)) +check(mtn("genkey", tkey), 0, false, false, string.rep(tkey.."\n", 2)) -- fail to enter any passphrase -check(cmd(mtn("chkeypass", tkey)), 1, false, false) +check(mtn("chkeypass", tkey), 1, false, false) -- fail to give correct old passphrase -check(cmd(mtn("chkeypass", tkey)), 1, false, false, string.rep("bad\n", 3)) +check(mtn("chkeypass", tkey), 1, false, false, string.rep("bad\n", 3)) -- fail to repeat new password -check(cmd(mtn("chkeypass", tkey)), 1, false, false, tkey.."\n"..tkey.."-new\nbad\n") +check(mtn("chkeypass", tkey), 1, false, false, tkey.."\n"..tkey.."-new\nbad\n") -- change the passphrase successfully -check(cmd(mtn("chkeypass", tkey)), 0, false, false, tkey.."\n"..string.rep(tkey.."-new\n", 2)) +check(mtn("chkeypass", tkey), 0, false, false, tkey.."\n"..string.rep(tkey.."-new\n", 2)) -- check that the passphrase changed +check(mtn("chkeypass", tkey), 0, false, false, tkey.."-new\n"..string.rep(tkey.."\n",2)) -check(cmd(mtn("chkeypass", tkey)), 0, false, false, tkey.."-new\n"..string.rep(tkey.."\n",2)) ============================================================ --- tests/checkout_creates_right__MTN_options/__driver__.lua d81cdfcfc714d9177a76fe1893b29ac82c0f5276 +++ tests/checkout_creates_right__MTN_options/__driver__.lua 96e523c6d38b613a00babbcfa0541d97fca816a1 @@ -11,19 +11,19 @@ -- all of these inherit options settings from the current _MTN dir -- unless they override them on the command line -check(cmd(raw_mtn("checkout", "test_dir1")), 0, false, false) -check(cmd(raw_mtn("--db=test.db", "checkout", "test_dir2")), 0, false, false) -check(cmd(raw_mtn("--db=test.db", "--branch=testbranch", "checkout", "test_dir3")), 0, false, false) -check(cmd(raw_mtn("--branch=testbranch", "checkout", "test_dir4")), 0, false, false) -check(cmd(raw_mtn("--db=test.db", "--branch=testbranch", "checkout", "--revision", rev, "test_dir5")), 0, false, false) -check(cmd(raw_mtn("--branch=testbranch", "checkout", "--revision", rev, "test_dir6")), 0, false, false) -check(cmd(raw_mtn("--db=test.db", "checkout", "--revision", rev, "test_dir7")), 0, false, false) -check(cmd(raw_mtn("checkout", "--revision", rev, "test_dir8")), 0, false, false) +check(raw_mtn("checkout", "test_dir1"), 0, false, false) +check(raw_mtn("--db=test.db", "checkout", "test_dir2"), 0, false, false) +check(raw_mtn("--db=test.db", "--branch=testbranch", "checkout", "test_dir3"), 0, false, false) +check(raw_mtn("--branch=testbranch", "checkout", "test_dir4"), 0, false, false) +check(raw_mtn("--db=test.db", "--branch=testbranch", "checkout", "--revision", rev, "test_dir5"), 0, false, false) +check(raw_mtn("--branch=testbranch", "checkout", "--revision", rev, "test_dir6"), 0, false, false) +check(raw_mtn("--db=test.db", "checkout", "--revision", rev, "test_dir7"), 0, false, false) +check(raw_mtn("checkout", "--revision", rev, "test_dir8"), 0, false, false) -- checkout fails if the specified revision is not a member of the specified branch -check(cmd(raw_mtn("--branch=foobar", "checkout", "--revision", rev, "test_dir9")), 1, false, false) -check(cmd(mtn("cert", rev, "branch", "foobar")), 0, false, false) -check(cmd(raw_mtn("--branch=foobar", "checkout", "--revision", rev, "test_dir10")), 0, false, false) +check(raw_mtn("--branch=foobar", "checkout", "--revision", rev, "test_dir9"), 1, false, false) +check(mtn("cert", rev, "branch", "foobar"), 0, false, false) +check(raw_mtn("--branch=foobar", "checkout", "--revision", rev, "test_dir10"), 0, false, false) for i = 1,8 do ============================================================ --- tests/checkout_validates_target_directory/__driver__.lua abf318148884207d412f7f064d350ce298bbcdd5 +++ tests/checkout_validates_target_directory/__driver__.lua 8e28d8ea40dc00dd3c11342d218c84b96df8ebf8 @@ -1,18 +1,18 @@ mtn_setup() addfile("testfile", "foo") commit() -check(cmd(mtn("--branch=testbranch", "checkout", "test_dir1")), +check(mtn("--branch=testbranch", "checkout", "test_dir1"), 0, false, false) writefile("test_dir2") -check(cmd(mtn("--branch=testbranch", "checkout", "test_dir2")), +check(mtn("--branch=testbranch", "checkout", "test_dir2"), 1, false, false) mkdir("test_dir3") -check(cmd(mtn("--branch=testbranch", "checkout", "test_dir3")), +check(mtn("--branch=testbranch", "checkout", "test_dir3"), 1, false, false) if existsonpath("chmod") and existsonpath("test") then @@ -22,9 +22,9 @@ else mkdir("test_dir4") check(cmd("chmod", "444", "test_dir4"), 0, false) - check(cmd(mtn("--branch=testbranch", "checkout", "test_dir4")), + check(mtn("--branch=testbranch", "checkout", "test_dir4"), 1, false, false) - check(cmd(mtn("--branch=testbranch", "checkout", "test_dir4/subdir")), + check(mtn("--branch=testbranch", "checkout", "test_dir4/subdir"), 1, false, false) -- Reset the permissions so Autotest can correctly clean up our -- temporary directory. @@ -39,5 +39,5 @@ mkdir("test_dir5") chdir("test_dir5") -check(cmd(mtn("--branch=testbranch", "checkout", ".")), 0, false, false) +check(mtn("--branch=testbranch", "checkout", "."), 0, false, false) chdir("..") ============================================================ --- tests/creating_a_bad_criss-cross_merge/__driver__.lua 1e60df2be65bc9164124f5ac8bc223cb11d34db4 +++ tests/creating_a_bad_criss-cross_merge/__driver__.lua 997c41fef50984e7609e886835e256ef3c8cca8a @@ -40,8 +40,8 @@ "--keydir=keys", unpack(arg)) end -check(cmd(bob("genkey", "bob")), 0, false, false, "bob\nbob\n") -check(cmd(alice("genkey", "alice")), 0, false, false, "alice\nalice\n") +check(bob("genkey", "bob"), 0, false, false, "bob\nbob\n") +check(alice("genkey", "alice"), 0, false, false, "alice\nalice\n") -- construct ancestor @@ -75,13 +75,13 @@ check(right_f_sha ~= left_f_sha) -- construct alice, a merge choosing the right side to win -check(cmd(alice("merge")), 0, false, false) +check(alice("merge"), 0, false, false) -- construct bob, a merge choosing the left side to win -check(cmd(bob("merge")), 0, false, false) +check(bob("merge"), 0, false, false) -- now merge the merges. this *should* fail. -- because there are conflicting changes and -- we have no merge3 hook to fall back on +check(mtn("merge"), 1, false, false) -check(cmd(mtn("merge")), 1, false, false) ============================================================ --- tests/creating_a_fork/__driver__.lua 0418474ec669629846a06b2f8b436ee4677418d4 +++ tests/creating_a_fork/__driver__.lua 570f5cf8f62d1867d089592a97666487cc7d8da3 @@ -1,9 +1,9 @@ mtn_setup() writefile("testfile", "version 0 of test file\n") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() root_r_sha = base_revision() root_f_sha = sha1("testfile") @@ -15,13 +15,13 @@ check(left_r_sha ~= right_r_sha) check(left_f_sha ~= right_f_sha) -check(cmd(mtn("--branch=testbranch", "heads")), 0, true, false) +check(mtn("--branch=testbranch", "heads"), 0, true, false) check(not qgrep("empty", "stdout")) probe_node("testfile", root_r_sha, root_f_sha) writefile("testfile", "right version of fork\n") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() right_r_sha = base_revision() right_f_sha = sha1("testfile") ============================================================ --- tests/creating_a_fork_and_merging/__driver__.lua edf276b996aa4bde792cf36fefcf8bcc9bc86f93 +++ tests/creating_a_fork_and_merging/__driver__.lua aabf962e9dd0ecff78c86288fdf3f2c57e231844 @@ -31,10 +31,10 @@ check(right_f_sha ~= left_f_sha) -- now merge and update again, this time successfully -check(cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("--branch=testbranch", "merge"), 0, false, false) +check(mtn("update"), 0, false, false) -check(cmd(mtn("--branch=testbranch", "heads")), 0, true, false) +check(mtn("--branch=testbranch", "heads"), 0, true, false) check(not qgrep("empty", "stdout")) -- files should now be merged ============================================================ --- tests/creating_a_fork_and_updating/__driver__.lua ae10a22f93591ac1fdf32104e372fc4ddec16026 +++ tests/creating_a_fork_and_updating/__driver__.lua 213098c02d50942968283ae5a5bc10a1569ad651 @@ -23,7 +23,7 @@ getfile("secondinsert", "testfile") -check(cmd(mtn("update")), 0, false, false) +check(mtn("update"), 0, false, false) -- files should now be merged ============================================================ --- tests/creating_a_good_and_bad_test_result/__driver__.lua 8057102a8f32c3ab8811f472f7a2f1a6574f6d74 +++ tests/creating_a_good_and_bad_test_result/__driver__.lua 28c620730a25c24afa3ad4000ad74f2ba6e54c13 @@ -1,8 +1,8 @@ mtn_setup() getfile("root", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() root_r_sha = base_revision() root_f_sha = sha1("testfile") @@ -24,10 +24,10 @@ probe_node("testfile", root_r_sha, root_f_sha) getfile("work", "testfile") -check(cmd(mtn("testresult", root_r_sha, "1")), 0, false, false) -check(cmd(mtn("testresult", left_good_r_sha, "1")), 0, false, false) -check(cmd(mtn("testresult", left_bad_r_sha, "0")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("testresult", root_r_sha, "1"), 0, false, false) +check(mtn("testresult", left_good_r_sha, "1"), 0, false, false) +check(mtn("testresult", left_bad_r_sha, "0"), 0, false, false) +check(mtn("update"), 0, false, false) -- files should now be merged ============================================================ --- tests/database_dump_load/__driver__.lua 26b6f8e0b8497fde25cd9d432edd1f4ac5c7dcfd +++ tests/database_dump_load/__driver__.lua 1a88a1146a252d753b5d6ee05ec98debb84789d6 @@ -1,9 +1,9 @@ mtn_setup() write_large_file("largish", 1) -check(cmd(mtn("genkey", "foo")), 0, false, false, "foo\nfoo\n") +check(mtn("genkey", "foo"), 0, false, false, "foo\nfoo\n") addfile("testfile1", "blah balh") commit("branch1") writefile("testfile1", "stuff stuff") @@ -11,15 +11,15 @@ -- include a largish file in the dump, so we can test for iostream breakage on -- MinGW wrt sync_with_stdio(). -check(cmd(mtn("add", "largish")), 0, false, false) +check(mtn("add", "largish"), 0, false, false) commit("branch2") -- run a db analyze so that SQLite creates any internal tables and indices, -- because we want to make sure we don't attempt to dump and load these. -check(cmd(mtn("db", "execute", "analyze;")), 0, false, false) +check(mtn("db", "execute", "analyze;"), 0, false, false) -check(cmd(mtn("db", "dump")), 0, true, false) +check(mtn("db", "dump"), 0, true, false) rename("stdout", "stdin") -check(cmd(mtn("db", "load", "--db=test2.db")), 0, false, false, true) +check(mtn("db", "load", "--db=test2.db"), 0, false, false, true) check_same_db_contents("test.db", "test2.db") ============================================================ --- tests/delete_work_file_on_checkout/__driver__.lua 83bdf136c65453873abd9b44139032aaa27c2eb6 +++ tests/delete_work_file_on_checkout/__driver__.lua 82d14343e33b5119bf3d739e4ca89b446d2a9e06 @@ -8,5 +8,5 @@ addfile("testfile1") check(exists("_MTN/work")) remove_recursive("_MTN") -check(cmd(mtn("checkout", "--revision", v1, ".")), 0, false, false) +check(mtn("checkout", "--revision", v1, "."), 0, false, false) check(not exists("_MTN/work")) ============================================================ --- tests/diffing_a_revision_with_an_added_file/__driver__.lua a5ecf57cdffe2f8a3adae115d4be50a2f34dd5a7 +++ tests/diffing_a_revision_with_an_added_file/__driver__.lua d221be9fd6460f6e9e16498db2910dba3a3cf1ee @@ -8,4 +8,4 @@ addfile("foo2", "foo file 2") commit() +check(mtn("diff", "--revision", parent, "--revision", base_revision()), 0, false, false) -check(cmd(mtn("diff", "--revision", parent, "--revision", base_revision())), 0, false, false) ============================================================ --- tests/disapproving_of_a_revision/__driver__.lua b30c89146ff365d9a5c73927e82119fa27d6521d +++ tests/disapproving_of_a_revision/__driver__.lua 45496133759ae45e279b3e4c45f5325597d59e0b @@ -1,8 +1,8 @@ mtn_setup() getfile("rootfile", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() root_r_sha = base_revision() root_f_sha = sha1("testfile") @@ -24,8 +24,8 @@ probe_node("testfile", root_r_sha, root_f_sha) getfile("updatefile", "testfile") -check(cmd(mtn("disapprove", left_bad_r_sha)), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("disapprove", left_bad_r_sha), 0, false, false) +check(mtn("update"), 0, false, false) -- files should now be merged ============================================================ --- tests/drop_missing_and_unknown_files/__driver__.lua c13655b9cd05d58f28cf28c410a117cc25b09292 +++ tests/drop_missing_and_unknown_files/__driver__.lua 6460ea6a3b90bbe432ef53dd9774c8d01dfbe0f2 @@ -9,25 +9,25 @@ os.remove("maude") -check(cmd(mtn("drop", "maude")), 0, false, true) +check(mtn("drop", "maude"), 0, false, true) check(qgrep('dropping maude from workspace manifest', "stderr")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("maude", "stdout")) check(not qgrep("harold", "stdout")) check(not qgrep("places/cemetery", "stdout")) -check(cmd(mtn("drop", "foobar")), 0, false, true) +check(mtn("drop", "foobar"), 0, false, true) check(qgrep("skipping foobar", "stderr")) os.remove("harold") os.remove("places/cemetery") -check(cmd(mtn("drop", "--missing")), 0, false, true) +check(mtn("drop", "--missing"), 0, false, true) check(qgrep('dropping harold from workspace manifest', "stderr")) check(qgrep('dropping places/cemetery from workspace manifest', "stderr")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("maude", "stdout")) check(qgrep("harold", "stdout")) check(qgrep("places/cemetery", "stdout")) ============================================================ --- tests/exchanging_work_via_netsync/__driver__.lua fa77d92622ec4fffa856326dcc98a1e90988ac76 +++ tests/exchanging_work_via_netsync/__driver__.lua 16e19052a2f83d67cef7b23182fbfc42d630e8a5 @@ -1,9 +1,9 @@ mtn_setup() netsync.setup() writefile("testfile", "version 0 of test file") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() f_ver = {} ver = {} @@ -17,7 +17,7 @@ netsync.pull("testbranch") -check(cmd(mtn2("ls", "certs", ver[0])), 0, true) +check(mtn2("ls", "certs", ver[0]), 0, true) rename("stdout", "certs") check(qgrep("date", "certs")) check(qgrep("author", "certs")) @@ -25,7 +25,7 @@ check(qgrep("changelog", "certs")) check(not qgrep("bad", "certs")) -check(cmd(mtn2("ls", "certs", ver[1])), 0, true) +check(mtn2("ls", "certs", ver[1]), 0, true) rename_over("stdout", "certs") check(qgrep("date", "certs")) check(qgrep("author", "certs")) @@ -37,15 +37,15 @@ {cmd = "get_revision", ver = ver[1]}, {cmd = "get_file", ver = f_ver[0]}, {cmd = "get_file", ver = f_ver[1]}} do - check(cmd(mtn2("automate", what.cmd, what.ver)), 0, true) + check(mtn2("automate", what.cmd, what.ver), 0, true) canonicalize("stdout") check(sha1("stdout") == what.ver) end -check(cmd(mtn("db", "info")), 0, true) +check(mtn("db", "info"), 0, true) canonicalize("stdout") info1 = sha1("stdout") -check(cmd(mtn2("db", "info")), 0, true) +check(mtn2("db", "info"), 0, true) canonicalize("stdout") info2 = sha1("stdout") check(info1 == info2) ============================================================ --- tests/explicit_merge/__driver__.lua f8a9fd534b53149ca200fcd6f8ff78b886f02bff +++ tests/explicit_merge/__driver__.lua bc1c384cd88f7947e9f53ddb646bf14eb71f388d @@ -24,11 +24,11 @@ commit() right = base_revision() -check(cmd(mtn("explicit_merge", left, right, "otherbranch")), 0, false, false) +check(mtn("explicit_merge", left, right, "otherbranch"), 0, false, false) -- Check that it didn't end up on our current branch, i.e. update doesn't do anything -check(cmd(mtn("update")), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("right", "testfile")) -check(cmd(mtn("checkout", "--branch=otherbranch", "otherbranch_co")), 0, false, false) +check(mtn("checkout", "--branch=otherbranch", "otherbranch_co"), 0, false, false) check(samefile("merged", "otherbranch_co/testfile")) ============================================================ --- tests/external_unit_test_of_the_line_merger/__driver__.lua 2ea0037fd766a52688bf3ff24709c9f9fea94c7f +++ tests/external_unit_test_of_the_line_merger/__driver__.lua b3273eb163740231020a773429034334f46a71a0 @@ -20,13 +20,13 @@ check(rver == right) copyfile("ancestor", "stdin") -check(cmd(mtn("fload")), 0, false, false, true) +check(mtn("fload"), 0, false, false, true) copyfile("left", "stdin") -check(cmd(mtn("fload")), 0, false, false, true) +check(mtn("fload"), 0, false, false, true) copyfile("right", "stdin") -check(cmd(mtn("fload")), 0, false, false, true) +check(mtn("fload"), 0, false, false, true) -check(cmd(mtn("fmerge", anc, left, right)), 0, true, false) +check(mtn("fmerge", anc, left, right), 0, true, false) canonicalize("stdout") rename("stdout", "merge.monotone") ============================================================ --- tests/first_extent_normalization_pass/__driver__.lua 59f5d1bc8ca96a2da85b7f3639471ff4cb4acaf9 +++ tests/first_extent_normalization_pass/__driver__.lua aaceb1dcdedaf5d90ae9760f0743969f6336e528 @@ -5,11 +5,11 @@ getfile("right") copyfile("left", "stdin") -check(cmd(mtn("fload")), 0, false, false, true) +check(mtn("fload"), 0, false, false, true) copyfile("right", "stdin") -check(cmd(mtn("fload")), 0, false, false, true) +check(mtn("fload"), 0, false, false, true) left = sha1("left") right = sha1("right") -check(cmd(mtn("fmerge", left, left, right)), 0, true, false) +check(mtn("fmerge", left, left, right), 0, true, false) canonicalize("stdout") check(samefile("right", "stdout")) ============================================================ --- tests/generating_and_extracting_keys_and_certs/__driver__.lua 4f85b1411adccd44f763f86292da5b1a2f2c6ee0 +++ tests/generating_and_extracting_keys_and_certs/__driver__.lua f6b0ea44a54f35e7c5cba81901fa80851e537f4d @@ -1,27 +1,27 @@ mtn_setup() tkey = "address@hidden" -- fail to enter a passphrase -check(cmd(mtn("genkey", tkey)), 1, false, false) +check(mtn("genkey", tkey), 1, false, false) -- fail to enter passphrase twice -check(cmd(mtn("genkey", tkey)), 1, false, false, tkey .. "\n") +check(mtn("genkey", tkey), 1, false, false, tkey .. "\n") -- generate a new key -check(cmd(mtn("genkey", tkey)), 0, false, false, tkey .. "\n" .. tkey .. "\n") +check(mtn("genkey", tkey), 0, false, false, tkey .. "\n" .. tkey .. "\n") -- check key exists -check(cmd(mtn("ls", "keys")), 0, true) +check(mtn("ls", "keys"), 0, true) check(qgrep(tkey, "stdout")) -- check globbing on name works -check(cmd(mtn("ls", "keys", "happy*")), 0, true) +check(mtn("ls", "keys", "happy*"), 0, true) check(qgrep(tkey, "stdout")) -- check globbing on bogus name misses key -check(cmd(mtn("ls", "keys", "burp*")), 0, true, false) +check(mtn("ls", "keys", "burp*"), 0, true, false) check(not qgrep(tkey, "stdout")) @@ -29,15 +29,15 @@ writefile("input.txt", "blah blah blah\n") -check(cmd(mtn("add", "input.txt")), 0, false, false) +check(mtn("add", "input.txt"), 0, false, false) commit() tsha = base_revision() -check(cmd(mtn("--key", tkey, "cert", tsha, "color", "pink")), 0, false, false) -check(cmd(mtn("ls", "certs", tsha)), 0, true) +check(mtn("--key", tkey, "cert", tsha, "color", "pink"), 0, false, false) +check(mtn("ls", "certs", tsha), 0, true) check(qgrep("pink", "stdout")) -check(cmd(mtn("--key", tkey, "cert", tsha, "color")), 0, false, false, "yellow\n") -check(cmd(mtn("ls", "certs", tsha)), 0, true, false) +check(mtn("--key", tkey, "cert", tsha, "color"), 0, false, false, "yellow\n") +check(mtn("ls", "certs", tsha), 0, true, false) check(qgrep("pink", "stdout")) check(qgrep("yellow", "stdout")) @@ -45,30 +45,30 @@ -- + in the domain portion don't work. goodkey = "address@hidden" -check(cmd(mtn("genkey", goodkey)), 0, false, false, string.rep(goodkey .. "\n", 2)) +check(mtn("genkey", goodkey), 0, false, false, string.rep(goodkey .. "\n", 2)) --exists -check(cmd(mtn("ls", "keys")), 0, true) +check(mtn("ls", "keys"), 0, true) -- remember '+' is a special character for regexes check(qgrep(string.gsub(goodkey, "+", "\\+"), "stdout")) -- bad keys fail badkey1 = "address@hidden" -check(cmd(mtn("genkey", badkey1)), 1, false, false, string.rep(badkey1 .. "\n", 2)) +check(mtn("genkey", badkey1), 1, false, false, string.rep(badkey1 .. "\n", 2)) badkey2 = "address@hidden" -check(cmd(mtn("genkey", badkey2)), 1, false, false, string.rep(badkey2 .. "\n", 2)) +check(mtn("genkey", badkey2), 1, false, false, string.rep(badkey2 .. "\n", 2)) -- fourth section, keys with all supported characters (for the user portion) -- in the user portion work, keys with the same in the domain portion don't -- work. goodkey = "address@hidden" -check(cmd(mtn("genkey", goodkey)), 0, false, false, string.rep(goodkey .. "\n", 2)) +check(mtn("genkey", goodkey), 0, false, false, string.rep(goodkey .. "\n", 2)) --exists -check(cmd(mtn("ls", "keys")), 0, true) +check(mtn("ls", "keys"), 0, true) check(qgrep(string.gsub(goodkey, "+", "\\+"), "stdout")) -- bad keys fail badkey1 = "address@hidden" -check(cmd(mtn("genkey", badkey1)), 1, false, false, string.rep(badkey1 .. "\n", 2)) +check(mtn("genkey", badkey1), 1, false, false, string.rep(badkey1 .. "\n", 2)) badkey2 = "address@hidden" +check(mtn("genkey", badkey2), 1, false, false, string.rep(badkey2 .. "\n", 2)) -check(cmd(mtn("genkey", badkey2)), 1, false, false, string.rep(badkey2 .. "\n", 2)) ============================================================ --- tests/importing_CVS_files/__driver__.lua a63f2eb6c193e70c451e6d5fd0ae3a8c21ffa4f6 +++ tests/importing_CVS_files/__driver__.lua c0187ccc14b3b1beb413aeee4361c19d52387b97 @@ -45,15 +45,15 @@ -- safety check -- we stop people from accidentally feeding their whole -- repo to cvs_import instead of just a module. -check(cmd(mtn("--branch=testbranch", "cvs_import", cvsroot)), 1, false, false) -check(cmd(mtn("--branch=testbranch", "cvs_import", cvsroot .. "/testdir")), 0, false, false) -check(cmd(mtn("automate", "get_file", tsha0)), 0, false) -check(cmd(mtn("automate", "get_file", tsha1)), 0, false) -check(cmd(mtn("automate", "get_file", tsha2)), 0, false) -check(cmd(mtn("automate", "get_file", tsha3)), 0, false) +check(mtn("--branch=testbranch", "cvs_import", cvsroot), 1, false, false) +check(mtn("--branch=testbranch", "cvs_import", cvsroot .. "/testdir"), 0, false, false) +check(mtn("automate", "get_file", tsha0), 0, false) +check(mtn("automate", "get_file", tsha1), 0, false) +check(mtn("automate", "get_file", tsha2), 0, false) +check(mtn("automate", "get_file", tsha3), 0, false) -- also check that history is okay -- has a unique head, and it's the -- right one. -check(cmd(mtn("checkout", "--branch=testbranch", "mtcodir")), 0, false, false) +check(mtn("checkout", "--branch=testbranch", "mtcodir"), 0, false, false) check(samefile("importme.3", "mtcodir/importme")) ============================================================ --- tests/importing_a_CVS_file_with_one_version/__driver__.lua 2e1237dc81f133325edf90326d472775d50d7fe5 +++ tests/importing_a_CVS_file_with_one_version/__driver__.lua 44497c092858e43cd0dbb2ee1204bb5ec5fa0787 @@ -25,5 +25,5 @@ -- import into monotone and check presence of file +check(mtn("--branch=testbranch", "cvs_import", cvsroot .. "/testdir"), 0, false, false) +check(mtn("automate", "get_file", tsha), 0, false) -check(cmd(mtn("--branch=testbranch", "cvs_import", cvsroot .. "/testdir")), 0, false, false) -check(cmd(mtn("automate", "get_file", tsha)), 0, false) ============================================================ --- tests/importing_a_file/__driver__.lua 04fadf6255b7ba1d4139d9e952cff68a1ccd2cc7 +++ tests/importing_a_file/__driver__.lua 1dc0e7c7c7723f74621f2c5aa58bce5ca8f8947f @@ -5,8 +5,8 @@ tsha = sha1("importme") -check(cmd(mtn("add", "importme")), 0, false, false) +check(mtn("add", "importme"), 0, false, false) commit() -check(cmd(mtn("automate", "get_file", tsha)), 0, true) +check(mtn("automate", "get_file", tsha), 0, true) canonicalize("stdout") check(samefile("importme", "stdout")) ============================================================ --- tests/importing_files_with_non-english_names/__driver__.lua b6d843c4a101c679ce29f26d4474836878a6da65 +++ tests/importing_files_with_non-english_names/__driver__.lua 8502ed1cd131fa725e65abc4736ec5fb736f2fad @@ -30,14 +30,14 @@ check(writefile("euc/" .. japanese_euc_jp, "")) end -check(cmd(mtn("add", "weird/file name with spaces")), 0, false, false) -check(cmd(mtn("add", "weird/" .. funny_filename)), 0, false, false) +check(mtn("add", "weird/file name with spaces"), 0, false, false) +check(mtn("add", "weird/" .. funny_filename), 0, false, false) -- add some files with UTF8 names set_env("LANG", "en_US.utf-8") set_env("CHARSET", "UTF-8") -check(cmd(mtn("add", "utf8/" .. european_utf8)), 0, false, false) -check(cmd(mtn("add", "utf8/" .. japanese_utf8)), 0, false, false) +check(mtn("add", "utf8/" .. european_utf8), 0, false, false) +check(mtn("add", "utf8/" .. japanese_utf8), 0, false, false) commit() @@ -46,7 +46,7 @@ set_env("LANG", "en_US.utf-8") set_env("CHARSET", "UTF-8") -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) os.rename("stdout", "manifest") check(qgrep("funny", "manifest")) check(qgrep("spaces", "manifest")) @@ -60,7 +60,7 @@ -- the tree, then, monotone will attempt to convert them to the current -- locale, and fail miserably. so get rid of them first. -check(cmd(mtn("drop", "utf8/" .. european_utf8, "utf8/" .. japanese_utf8)), 0, false, false) +check(mtn("drop", "utf8/" .. european_utf8, "utf8/" .. japanese_utf8), 0, false, false) commit() -- OS X expects data passed to the OS to be utf8, so these tests don't make @@ -70,14 +70,14 @@ set_env("LANG", "de_DE.iso-8859-1") set_env("CHARSET", "iso-8859-1") - check(cmd(mtn("add", "8859-1/" .. european_8859_1)), 0, false, false) + check(mtn("add", "8859-1/" .. european_8859_1), 0, false, false) commit() end -- check the names showed up in our manifest -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) os.rename("stdout", "manifest") check(qgrep("funny", "manifest")) check(qgrep("spaces", "manifest")) @@ -88,7 +88,7 @@ -- okay, clean up again if ostype ~= "Darwin" then - check(cmd(mtn("drop", "8859-1/" .. european_8859_1)), 0, false, false) + check(mtn("drop", "8859-1/" .. european_8859_1), 0, false, false) commit() end @@ -97,14 +97,14 @@ if ostype ~= "Darwin" then set_env("LANG", "ja_JP.euc-jp") set_env("CHARSET", "euc-jp") - check(cmd(mtn("add", "euc/" .. japanese_euc_jp)), 0, false, false) + check(mtn("add", "euc/" .. japanese_euc_jp), 0, false, false) commit() end -- check the names showed up in our manifest -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) os.rename("stdout", "manifest") check(qgrep("funny", "manifest")) check(qgrep("spaces", "manifest")) ============================================================ --- tests/list_missing_files/__driver__.lua b926a8569fada085efe533609783127919ef0843 +++ tests/list_missing_files/__driver__.lua b134a041b42a0cd745398b98fad82aa016df949b @@ -9,30 +9,30 @@ writefile("missingbar", "bar\n") -check(cmd(mtn("ls", "missing")), 0, false) +check(mtn("ls", "missing"), 0, false) -check(cmd(mtn("add", "foo", "bar")), 0, false, false) -check(cmd(mtn("ls", "missing")), 0, false) +check(mtn("add", "foo", "bar"), 0, false, false) +check(mtn("ls", "missing"), 0, false) remove("foo") -check(cmd(mtn("ls", "missing")), 0, true, 0) +check(mtn("ls", "missing"), 0, true, 0) canonicalize("stdout") check(samefile("stdout", "missingfoo")) writefile("foo") -check(cmd(mtn("drop", "foo")), 0, false, false) +check(mtn("drop", "foo"), 0, false, false) remove("foo") -check(cmd(mtn("ls", "missing")), 0, 0, 0) +check(mtn("ls", "missing"), 0, 0, 0) commit() -check(cmd(mtn("ls", "missing")), 0, 0, 0) +check(mtn("ls", "missing"), 0, 0, 0) remove("bar") -check(cmd(mtn("ls", "missing")), 0, true, 0) +check(mtn("ls", "missing"), 0, true, 0) canonicalize("stdout") check(samefile("stdout", "missingbar")) writefile("bar") -check(cmd(mtn("drop", "bar")), 0, false, false) +check(mtn("drop", "bar"), 0, false, false) remove("bar") +check(mtn("ls", "missing"), 0, 0, 0) -check(cmd(mtn("ls", "missing")), 0, 0, 0) ============================================================ --- tests/manifest_restrictions/__driver__.lua 0f07ea8cd7d9ec8b63f48f008a2d10ee7492a7a1 +++ tests/manifest_restrictions/__driver__.lua a3aa4b28c821c39e85db8bab4469bb437ded40c5 @@ -25,43 +25,43 @@ -- FIXME_RESTRICTIONS: the old code allows for --depth=N with no paths -- and adds the "." path so that depth is interpreted against the current -- included directory. this seems bad. how does --depth interact with --exclude? ---check(cmd(mtn("ls", "known", "--depth=0")), 0, true, false) +--check(mtn("ls", "known", "--depth=0"), 0, true, false) --check(not qgrep("fileX", "stdout")) -check(cmd(mtn("ls", "known", "--depth=0", ".")) , 0, true, false) +check(mtn("ls", "known", "--depth=0", ".") , 0, true, false) check(not qgrep("fileX", "stdout")) -check(cmd(mtn("ls", "known", "--depth=1", ".")) , 0, true, false) +check(mtn("ls", "known", "--depth=1", ".") , 0, true, false) check(qgrep("fileX", "stdout")) -check(cmd(mtn("ls", "known", "--depth=0", "work/A")) , 0, true, false) +check(mtn("ls", "known", "--depth=0", "work/A") , 0, true, false) check(not qgrep("fileAB", "stdout")) -check(cmd(mtn("ls", "known", "--depth=1", "work/A")) , 0, true, false) +check(mtn("ls", "known", "--depth=1", "work/A") , 0, true, false) check(qgrep("fileAB", "stdout")) -- test restriction of unknown, missing, ignored files -check(cmd(mtn("ls", "unknown")), 0, true, false) +check(mtn("ls", "unknown"), 0, true, false) check(qgrep("work/file4", "stdout")) -check(cmd(mtn("ls", "unknown", "work")), 0, true, false) +check(mtn("ls", "unknown", "work"), 0, true, false) check(qgrep("work/file4", "stdout")) os.rename("work/file2", "work/filex2") -check(cmd(mtn("ls", "missing")), 0, true, false) +check(mtn("ls", "missing"), 0, true, false) check(qgrep("work/file2", "stdout")) -check(cmd(mtn("ls", "missing", "work/file2")), 0, true, false) +check(mtn("ls", "missing", "work/file2"), 0, true, false) check(qgrep("work/file2", "stdout")) os.rename("work/filex2", "work/file2") -check(cmd(mtn("ls", "ignored", "--rcfile=ignored.lua")), 0, true, false) +check(mtn("ls", "ignored", "--rcfile=ignored.lua"), 0, true, false) check(qgrep("work/foo.o", "stdout")) -check(cmd(mtn("ls", "ignored", "--rcfile=ignored.lua", "work")), 0, true, false) +check(mtn("ls", "ignored", "--rcfile=ignored.lua", "work"), 0, true, false) check(qgrep("work/foo.o", "stdout")) -- create moved, dropped, and changed work to test status, diff, commit @@ -73,9 +73,9 @@ writefile("work/A/fileA", "version 2 of fileA with some changes") writefile("work/A/B/fileAB", "version 2 of fileAB with some changes") -check(cmd(mtn("rename", "work/fileX", "work/file1")), 0, false, false) -check(cmd(mtn("drop", "work/file2")), 0, false, false) -check(cmd(mtn("add", "work/file4")), 0, false, false) +check(mtn("rename", "work/fileX", "work/file1"), 0, false, false) +check(mtn("drop", "work/file2"), 0, false, false) +check(mtn("add", "work/file4"), 0, false, false) -- moved fileX to file1 -- dropped file2 @@ -116,77 +116,77 @@ -- status -check(cmd(mtn("status")), 0, true, false) +check(mtn("status"), 0, true, false) check(included("X", 1, 2, 3, 4), 0, false) -- include both source and target of rename -check(cmd(mtn("status", "work/fileX", "work/file1")), 0, true, false) +check(mtn("status", "work/fileX", "work/file1"), 0, true, false) check(included("X", 1)) check(excluded(2, 3, 4)) -- include drop -check(cmd(mtn("status", "work/file2")), 0, true, false) +check(mtn("status", "work/file2"), 0, true, false) check(included(2)) check(excluded("X", 1, 3, 4)) -- include delta -check(cmd(mtn("status", "work/file3")), 0, true, false) +check(mtn("status", "work/file3"), 0, true, false) check(included(3)) check(excluded("X", 1, 2, 4)) -- include add -check(cmd(mtn("status", "work/file4")), 0, true, false) +check(mtn("status", "work/file4"), 0, true, false) check(included(4)) check(excluded("X", 1, 2, 3)) -- diff -check(cmd(mtn("diff")), 0, true, false) +check(mtn("diff"), 0, true, false) check(included("X", 1, 2, 3, 4)) -check(cmd(mtn("diff", "--depth=0", ".")), 0, true, false) +check(mtn("diff", "--depth=0", "."), 0, true, false) check(not qgrep("fileAB", "stdout")) -check(cmd(mtn("diff", "--depth=2", ".")), 0, true, false) +check(mtn("diff", "--depth=2", "."), 0, true, false) check(qgrep("fileA", "stdout")) -check(cmd(mtn("diff", "--context", "--depth=0", ".")), 0, true, false) +check(mtn("diff", "--context", "--depth=0", "."), 0, true, false) check(not qgrep("fileAB", "stdout")) -check(cmd(mtn("diff", "--context", "--depth=2", ".")), 0, true, false) +check(mtn("diff", "--context", "--depth=2", "."), 0, true, false) check(qgrep("fileA", "stdout")) -- include both source and target of rename -check(cmd(mtn("diff", "work/fileX", "work/file1")), 0, true, false) +check(mtn("diff", "work/fileX", "work/file1"), 0, true, false) check(included("X", 1)) check(excluded(2, 3, 4)) -- include drop -check(cmd(mtn("diff", "work/file2")), 0, true, false) +check(mtn("diff", "work/file2"), 0, true, false) check(included(2)) check(excluded("X", 1, 3, 4)) -- include delta -check(cmd(mtn("diff", "work/file3")), 0, true, false) +check(mtn("diff", "work/file3"), 0, true, false) check(included(3)) check(excluded("X", 1, 2, 4)) -- include add -check(cmd(mtn("diff", "work/file4")), 0, true, false) +check(mtn("diff", "work/file4"), 0, true, false) check(included(4)) check(excluded("X", 1, 2, 3)) -- commit -check(cmd(mtn("status")), 0, true, false) +check(mtn("status"), 0, true, false) check(included("X", 1, 2, 3, 4)) -- include rename source and target @@ -194,31 +194,31 @@ check(cmd(mtn("commit", "--message=move fileX to file1", "work/fileX", "work/file1")), 0, false, false) -check(cmd(mtn("status")), 0, true, false) +check(mtn("status"), 0, true, false) check(included(2, 3, 4)) check(excluded("X", 1)) -- include drop -check(cmd(mtn("commit", "--message=drop file2", "work/file2")), 0, false, false) +check(mtn("commit", "--message=drop file2", "work/file2"), 0, false, false) -check(cmd(mtn("status")), 0, true, false) +check(mtn("status"), 0, true, false) check(included(3, 4)) check(excluded("X", 1, 2)) -- include delta -check(cmd(mtn("commit", "--message=change file3", "work/file3")), 0, false, false) +check(mtn("commit", "--message=change file3", "work/file3"), 0, false, false) -check(cmd(mtn("status")), 0, true, false) +check(mtn("status"), 0, true, false) check(included(4)) check(excluded("X", 1, 2, 3)) -- include add -check(cmd(mtn("commit", "--message=add file4", "work/file4")), 0, false, false) +check(mtn("commit", "--message=add file4", "work/file4"), 0, false, false) -check(cmd(mtn("status")), 0, true, false) +check(mtn("status"), 0, true, false) check(excluded("X", 1, 2, 3, 4)) -- setup for excluded commits @@ -258,7 +258,7 @@ end end -check(cmd(mtn("diff", "file.four", "file.ten")), 0, true, false) +check(mtn("diff", "file.four", "file.ten"), 0, true, false) check(qgrep("file.four", "stdout")) check(qgrep("file.ten", "stdout")) ============================================================ --- tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua b0c2c29a5d98eff77f2fc62a12987ef53a05420f +++ tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua b567ed88b67b06445deec99e9d3019123c8aebeb @@ -9,15 +9,15 @@ base = base_revision() copyfile("v1", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() remove("testfile") -check(cmd(mtn("drop", "testfile")), 0, false, false) +check(mtn("drop", "testfile"), 0, false, false) commit() copyfile("v2", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() revert_to(base) @@ -25,6 +25,6 @@ addfile("otherfile", "this space for rent") commit() -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("testfile", "v2")) ============================================================ --- tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua 7a40015398252bda3fca04a1af6ba108f5633b65 +++ tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua 5460bea6c9e6ac125b2138d5a2747bcd346790ae @@ -10,18 +10,18 @@ base = base_revision() copyfile("v1a", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() copyfile("v1b", "testfile") commit() remove("testfile") -check(cmd(mtn("drop", "testfile")), 0, false, false) +check(mtn("drop", "testfile"), 0, false, false) commit() copyfile("v2a", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() revert_to(base) @@ -29,6 +29,6 @@ addfile("otherfile", "this space for rent") commit() -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("testfile", "v2a")) ============================================================ --- tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua 606e29b2a9ee0908c8e6cd49deca0f4924b9e48f +++ tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua dac336dbf180056dbe184723f0504f861ea563bc @@ -6,7 +6,7 @@ writefile("v2a", "baz blah") copyfile("v1a", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() base = base_revision() @@ -14,11 +14,11 @@ commit() remove("testfile") -check(cmd(mtn("drop", "testfile")), 0, false, false) +check(mtn("drop", "testfile"), 0, false, false) commit() copyfile("v2a", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() revert_to(base) @@ -26,6 +26,6 @@ addfile("otherfile", "this space for rent") commit() -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("testfile", "v2a")) ============================================================ --- tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua 91b4b480be1eb7445c73c4a9d889c1237a7700bb +++ tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua ef0b509c5f7b1bc19b3c8060130647cc00a9fb36 @@ -14,26 +14,26 @@ base = base_revision() copyfile("right_1_a", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() copyfile("right_1_b", "testfile") commit() remove("testfile") -check(cmd(mtn("drop", "testfile")), 0, false, false) +check(mtn("drop", "testfile"), 0, false, false) commit() copyfile("right_2_a", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() revert_to(base) copyfile("left", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() -xfail_if(true, cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +xfail_if(true, mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("testfile", "right_2_a") or samefile("testfile", "left")) ============================================================ --- tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua 4478c937bffa6df632675027e4bf9f01f64c9a7d +++ tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua 567651816fcf9dc5bde90899d2739f9703f836fd @@ -9,7 +9,7 @@ writefile("new_right", "baz blah") copyfile("base", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() base = base_revision() @@ -19,13 +19,13 @@ revert_to(base) remove("testfile") -check(cmd(mtn("drop", "testfile")), 0, false, false) +check(mtn("drop", "testfile"), 0, false, false) commit() copyfile("new_right", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("testfile", "new_right")) ============================================================ --- tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua a85e07e9d549c8faa150e10957f529a8cead3948 +++ tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua a43d6187d0ccfd94a6def14211b952c86a869473 @@ -27,48 +27,48 @@ revs = {} -- produce state A -check(cmd(mtn("add", "foo")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) commit("branch.main") revs.a = base_revision() -- produce state C -check(cmd(mtn("add", "bar")), 0, false, false) +check(mtn("add", "bar"), 0, false, false) commit("branch.main") revs.c = base_revision() -check(cmd(mtn("cert", revs.c, "branch", "branch.fork"))) +check(mtn("cert", revs.c, "branch", "branch.fork")) -- produce state F revert_to(revs.a) -check(cmd(mtn("add", "iced")), 0, false, false) +check(mtn("add", "iced"), 0, false, false) commit("branch.fork") revs.f = base_revision() -- merge heads of branch.fork to make D -check(cmd(mtn("--branch=branch.fork", "merge")), 0, false, false) +check(mtn("--branch=branch.fork", "merge"), 0, false, false) -- produce state E revert_to(revs.c, "branch.main") -check(cmd(mtn("drop", "bar")), 0, false, false) +check(mtn("drop", "bar"), 0, false, false) commit("branch.main") revs.e = base_revision() -- state G revert_to(revs.a) -check(cmd(mtn("add", "quux")), 0, false, false) +check(mtn("add", "quux"), 0, false, false) commit("branch.main") revs.g = base_revision() -- merge to get state B -check(cmd(mtn("--branch=branch.main", "merge")), 0, false, false) +check(mtn("--branch=branch.main", "merge"), 0, false, false) -- now try the propagate -check(cmd(mtn("propagate", "branch.main", "branch.fork")), 0, false, false) +check(mtn("propagate", "branch.main", "branch.fork"), 0, false, false) -- check remove_recursive("_MTN") -check(cmd(mtn("--branch=branch.fork", "checkout", "."))) +check(mtn("--branch=branch.fork", "checkout", ".")) -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) rename("stdout", "manifest") check(not qgrep("bar", "manifest")) check(qgrep("quux", "manifest")) ============================================================ --- tests/merging_a_rename_twice/__driver__.lua 473ca98c8bb0ff9f01edd8eae5c02fa6b5ed3c67 +++ tests/merging_a_rename_twice/__driver__.lua 31a1be043ecb8735f0c09ade850b5aed6540f694 @@ -28,7 +28,7 @@ revs = {} -- produce state A -check(cmd(mtn("add", "x")), 0, false, false) +check(mtn("add", "x"), 0, false, false) commit("branch.x") revs.a = base_revision() @@ -43,47 +43,47 @@ -- produce state E revert_to(revs.a) -check(cmd(mtn("rename", "x", "y")), 0, false, false) +check(mtn("rename", "x", "y"), 0, false, false) rename("x", "y") commit("branch.y") revs.e = base_revision() -- produce state F -check(cmd(mtn("add", "foo")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) commit("branch.y") -- produce state G -check(cmd(mtn("propagate", "branch.x", "branch.y")), 0, false, false) -check(cmd(mtn("--branch=branch.y", "update")), 0, false, false) +check(mtn("propagate", "branch.x", "branch.y"), 0, false, false) +check(mtn("--branch=branch.y", "update"), 0, false, false) revs.g = base_revision() check(qgrep('state C', "y")) -- produce state D revert_to(revs.c) writefile("x", "data of state D") -check(cmd(mtn("add", "bar")), 0, false, false) +check(mtn("add", "bar"), 0, false, false) commit("branch.x") -- produce state H revert_to(revs.g) -check(cmd(mtn("add", "baz")), 0, false, false) +check(mtn("add", "baz"), 0, false, false) commit("branch.y") -- produce state I -check(cmd(mtn("propagate", "branch.x", "branch.y")), 0, false, false) -check(cmd(mtn("--branch=branch.y", "update")), 0, false, false) +check(mtn("propagate", "branch.x", "branch.y"), 0, false, false) +check(mtn("--branch=branch.y", "update"), 0, false, false) check(qgrep('state D', "y")) -- produce state J revert_to(revs.e) -check(cmd(mtn("add", "quux")), 0, false, false) +check(mtn("add", "quux"), 0, false, false) commit("branch.y") -- produce state K -check(cmd(mtn("--branch=branch.y", "merge")), 0, false, false) -check(cmd(mtn("--branch=branch.y", "update")), 0, false, false) +check(mtn("--branch=branch.y", "merge"), 0, false, false) +check(mtn("--branch=branch.y", "update"), 0, false, false) -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) os.rename("stdout", "manifest") check(qgrep('"y"', "manifest")) check(not qgrep('"x"', "manifest")) ============================================================ --- tests/merging_adds/__driver__.lua dfb2cf3a556ab1477e77e79d064a4b74f2857bea +++ tests/merging_adds/__driver__.lua 3d022afdda9830918a4f448546bdb059f1b4d570 @@ -15,8 +15,8 @@ commit() right = base_revision() -check(cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("--branch=testbranch", "merge"), 0, false, false) +check(mtn("update"), 0, false, false) writefile("expected_irrelevant", "this is just a file\n") writefile("expected_data1", "This is test file 1\n") ============================================================ --- tests/merging_adds_in_unrelated_revisions/__driver__.lua 3573d2502f0f5b458dc75a54cb976baec7057338 +++ tests/merging_adds_in_unrelated_revisions/__driver__.lua 22ec6f9238dfac16e2ea67361e90d142d38ada80 @@ -9,14 +9,14 @@ left = base_revision() remove_recursive("_MTN") -check(cmd(mtn("setup", "--branch=testbranch", ".")), 0, false, false) +check(mtn("setup", "--branch=testbranch", "."), 0, false, false) addfile("testfile2", "This is test file 2\n") commit() right = base_revision() -xfail_if(true, cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +xfail_if(true, mtn("--branch=testbranch", "merge"), 0, false, false) +check(mtn("update"), 0, false, false) writefile("expected_data1", "This is test file 1\n") writefile("expected_data2", "This is test file 2\n") ============================================================ --- tests/merging_an_add_edge/__driver__.lua 73d4d648e483f04fe35c9d70f127b080870f2bed +++ tests/merging_an_add_edge/__driver__.lua 40999b2c29efbd8e9f98e7bdc7bb880c3a49f87b @@ -22,11 +22,11 @@ commit() -xfail_if(true, cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +xfail_if(true, mtn("--branch=testbranch", "merge"), 0, false, false) +check(mtn("update"), 0, false, false) merged = base_revision() -check(cmd(mtn("automate", "get_revision", merged)), 0, true) +check(mtn("automate", "get_revision", merged), 0, true) rename("stdout", "rev") check(not qgrep("add_file", "rev")) ============================================================ --- tests/merging_data_in_unrelated_files/__driver__.lua 2675e2d9795e4a10c53ef95c13b23b5040815ac2 +++ tests/merging_data_in_unrelated_files/__driver__.lua c64d4c93b6212896eed7ba97fec668af843213de @@ -8,19 +8,19 @@ anc = base_revision() getfile("left", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() left = base_revision() revert_to(anc) getfile("right", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() right = base_revision() -xfail_if(true, cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +xfail_if(true, mtn("--branch=testbranch", "merge"), 0, false, false) +check(mtn("update"), 0, false, false) writefile("expected_foo", "irrelevant file\n") ============================================================ --- tests/merging_data_in_unrelated_revisions/__driver__.lua 162fb9899df051fba839e65d2066fa927fe544db +++ tests/merging_data_in_unrelated_revisions/__driver__.lua 2cf02eca460fb6f458c50396be7a8a4763acd578 @@ -9,14 +9,14 @@ left = base_revision() remove_recursive("_MTN") -check(cmd(mtn("setup", "--branch=testbranch", ".")), 0, false, false) +check(mtn("setup", "--branch=testbranch", "."), 0, false, false) getfile("right", "testfile") addfile("testfile") commit() right = base_revision() -xfail_if(true, cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -AT_CHECK(cmd(mtn("update")), 0, false, false) +xfail_if(true, mtn("--branch=testbranch", "merge"), 0, false, false) +AT_CHECK(mtn("update"), 0, false, false) check(samefile("left", "testfile") or samefile("right", "testfile")) ============================================================ --- tests/mtn_add_dot/__driver__.lua f415932a2ab7d4b107f73369c67c58be9c6d05e3 +++ tests/mtn_add_dot/__driver__.lua 74f5fb10c01664357f17c76e6ff2056dbb2bd5b5 @@ -9,21 +9,21 @@ writefile("subdir/testdir1/subfile1", "baz") writefile("subdir/testdir1/subfile2", "quux") -check(cmd(mtn("setup", "--branch=testbranch", "subdir")), 0, false, false) +check(mtn("setup", "--branch=testbranch", "subdir"), 0, false, false) -- Make sure that "add ." works, even at the root of the tree chdir("subdir") -check(cmd(mtn("add", ".")), 0, false, false) +check(mtn("add", "."), 0, false, false) -- Make sure that it took -check(cmd(mtn("commit", "--message=foo")), 0, false, false) +check(mtn("commit", "--message=foo"), 0, false, false) chdir("..") remove("subdir/testfile1") remove("subdir/testfile2") remove_recursive("subdir/testdir1") chdir("subdir") -check(cmd(mtn("revert", ".")), 0, false, false) +check(mtn("revert", "."), 0, false, false) chdir("..") check(exists("subdir/testfile1")) ============================================================ --- tests/multiple_version_committing/__driver__.lua f4e5e8bf962c73fbac206322b2ef3d0eedd2d955 +++ tests/multiple_version_committing/__driver__.lua 511ce318109104c815f97bd757e1481ee611defa @@ -1,8 +1,8 @@ mtn_setup() writefile("testfile", "version 0 of the file\n") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() fsha = {} @@ -19,10 +19,10 @@ for i = 1, 6 do test_log:write(string.format("checking version %i of the file\n", i)) writefile("testfile", string.format("version %i of the file\n", i)) - check(cmd(mtn("automate", "get_file", fsha[i])), 0, true) + check(mtn("automate", "get_file", fsha[i]), 0, true) canonicalize("stdout") check(samefile("stdout", "testfile")) remove_recursive("_MTN") - check(cmd(mtn("checkout", "--revision", rsha[i], ".")), 0, true) + check(mtn("checkout", "--revision", rsha[i], "."), 0, true) check(sha1("testfile") == fsha[i]) end ============================================================ --- tests/netsync_transfers_public_keys/__driver__.lua be1446c019833ef0be51f560d39767aee6ded881 +++ tests/netsync_transfers_public_keys/__driver__.lua 1e4004a3d09ba2223ccace79a66d1c8bdcaed5c0 @@ -6,7 +6,7 @@ privkey = "06b040c37796863b53f10dc23fcccf379cc2e259" getfile("newkeys.txt", "stdin") -check(cmd(mtn("read")), 0, false, false, true) +check(mtn("read"), 0, false, false, true) -- First commit a version that doesn't use the new key, and make sure -- that it doesn't get transferred. @@ -15,7 +15,7 @@ netsync.pull("testbranch") -check(cmd(mtn2("ls", "keys")), 0, true, false) +check(mtn2("ls", "keys"), 0, true, false) check(not qgrep(pubkey, "stdout")) check(not qgrep(privkey, "stdout")) @@ -25,7 +25,7 @@ "testbranch", "address@hidden")), 0, false, false) srv:finish() -check(cmd(mtn2("dropkey", "address@hidden")), 0, false, false) +check(mtn2("dropkey", "address@hidden"), 0, false, false) -- Now commit a version that does use the new key, and make sure that -- now it does get transferred. @@ -35,6 +35,6 @@ netsync.pull("testbranch") -check(cmd(mtn2("ls", "keys")), 0, true, false) +check(mtn2("ls", "keys"), 0, true, false) check(qgrep(pubkey, "stdout")) check(not qgrep(privkey, "stdout")) ============================================================ --- tests/no-change_deltas_disappear/__driver__.lua 6bedf84a5390a8ebf2bbc3b03cfb99c7948da842 +++ tests/no-change_deltas_disappear/__driver__.lua 93be632c2e4e6ee8d6f8a9bea2ca8969c16c86f6 @@ -23,7 +23,7 @@ writefile("testfile", "version 1") addfile("end_file", "end file") -check(cmd(mtn("drop", "start_file")), 0, true, false) +check(mtn("drop", "start_file"), 0, true, false) commit() revs.new = base_revision() files.new = sha1("testfile") @@ -31,13 +31,13 @@ check(files.base == files.new) -check(cmd(mtn("diff", "--revision", revs.base, - "--revision", revs.new)), +check(mtn("diff", "--revision", revs.base, + "--revision", revs.new), 0, true, false) check(qgrep(files.new_other, "stdout")) check(not qgrep(files.base, "stdout")) -check(cmd(mtn("diff", "--revision", revs.new, - "--revision", revs.base)), +check(mtn("diff", "--revision", revs.new, + "--revision", revs.base), 0, true, false) check(qgrep(files.base_other, "stdout")) check(not qgrep(files.base, "stdout")) ============================================================ --- tests/persistence_of_passphrase/__driver__.lua 95450071d2c5bfc025f225d9c2fe9722ac6efba1 +++ tests/persistence_of_passphrase/__driver__.lua 0409770163b399bbf796bf2c7427111d07ef7f2b @@ -5,15 +5,15 @@ writefile("input.txt", "version 0 of the file\n") -check(cmd(mtn("add", "input.txt")), 0, false, false) +check(mtn("add", "input.txt"), 0, false, false) writefile("input.txt", "version 1 of the file\n") -check(cmd(mtn("--branch=testbranch", "--rcfile=persist.lua", "--message=blah-blah", "commit")), 0, false, false, "address@hidden") +check(mtn("--branch=testbranch", "--rcfile=persist.lua", "--message=blah-blah", "commit"), 0, false, false, "address@hidden") tsha = base_revision() -check(cmd(mtn("ls", "certs", tsha)), 0, true) +check(mtn("ls", "certs", tsha), 0, true) os.rename("stdout", "certs") for i,name in pairs{"branch", "author", "date", "changelog"} do ============================================================ --- tests/persistent_netsync_server_-_keys/__driver__.lua 23f5e46ab0916fa3be47fad94e77d9a9fce06e7f +++ tests/persistent_netsync_server_-_keys/__driver__.lua a73946ef1a105f8f5751b4c5b7afa130b5709b87 @@ -1,28 +1,28 @@ mtn_setup() netsync.setup() writefile("testfile", "I am you and you are me and we are all together.") -check(cmd(mtn2("add", "testfile")), 0, false, false) -check(cmd(mtn2("commit", "--branch=testbranch", "--message=foo")), 0, false, false) +check(mtn2("add", "testfile"), 0, false, false) +check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false) -check(cmd(mtn2("genkey", "address@hidden")), 0, false, false, string.rep("address@hidden",2)) +check(mtn2("genkey", "address@hidden"), 0, false, false, string.rep("address@hidden",2)) srv = netsync.start("testbranch") srv:push("testbranch", 2) srv:pull("testbranch", 3) -check(cmd(mtn3("ls", "keys")), 0, true, false) +check(mtn3("ls", "keys"), 0, true, false) check(not qgrep("address@hidden", "stdout")) writefile("testfile", "stuffty stuffty") -check(cmd(mtn2("commit", "--branch=testbranch", "--message=foo", "address@hidden")), 0, false, false) +check(mtn2("commit", "--branch=testbranch", "--message=foo", "address@hidden"), 0, false, false) srv:push("testbranch", 2) srv:pull("testbranch", 3) srv:finish() -check(cmd(mtn3("ls", "keys")), 0, true, false) +check(mtn3("ls", "keys"), 0, true, false) check(qgrep("address@hidden", "stdout")) ============================================================ --- tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua 138dd2eebf0cde0914a678facee439f8186914a7 +++ tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua 426e9f7e63c3f96c69580449eda4419383427e7e @@ -5,15 +5,15 @@ revs = {} writefile("testfile", "foo bar") -check(cmd(mtn2("add", "testfile")), 0, false, false) -check(cmd(mtn2("commit", "--branch=testbranch", "--message=foo")), 0, false, false) +check(mtn2("add", "testfile"), 0, false, false) +check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false) revs[1] = base_revision() remove_recursive("_MTN") -check(cmd(mtn3("setup", "--branch=testbranch", ".")), 0, false, false) +check(mtn3("setup", "--branch=testbranch", "."), 0, false, false) writefile("otherfile", "baz quux") -check(cmd(mtn3("add", "otherfile")), 0, false, false) -check(cmd(mtn3("commit", "--branch=testbranch", "--message=foo")), 0, false, false) +check(mtn3("add", "otherfile"), 0, false, false) +check(mtn3("commit", "--branch=testbranch", "--message=foo"), 0, false, false) revs[2] = base_revision() srv = netsync.start("testbranch") @@ -22,12 +22,12 @@ srv:sync("testbranch", 3) function chksy(n, co_mtn) - check_same_stdout(cmd(mtn2("automate", "get_revision", revs[n])), - cmd(mtn3("automate", "get_revision", revs[n]))) - check_same_stdout(cmd(mtn2("ls", "certs", revs[n])), - cmd(mtn3("ls", "certs", revs[n]))) + check_same_stdout(mtn2("automate", "get_revision", revs[n]), + mtn3("automate", "get_revision", revs[n])) + check_same_stdout(mtn2("ls", "certs", revs[n]), + mtn3("ls", "certs", revs[n])) remove_recursive("somedir") - check(cmd(co_mtn("checkout", "--revision", revs[n], "somedir")), 0, false, false) + check(co_mtn("checkout", "--revision", revs[n], "somedir"), 0, false, false) end chksy(1, mtn3) @@ -38,17 +38,17 @@ -- And now make sure it works for children, where there are diffs and all writefile("otherfile", "foo bar, baz, also quux (on off days)") -check(cmd(mtn3("commit", "--branch=testbranch", "--message=foo")), 0, false, false) +check(mtn3("commit", "--branch=testbranch", "--message=foo"), 0, false, false) revs[3] = base_revision() remove_recursive("_MTN") -check(cmd(mtn2("checkout", "--revision", revs[1], ".")), 0, false, false) +check(mtn2("checkout", "--revision", revs[1], "."), 0, false, false) writefile("testfile", "ptang") -check(cmd(mtn2("commit", "--branch=testbranch", "--message=foo")), 0, false, false) +check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false) revs[4] = base_revision() -- And add a cert on an old revision -check(cmd(mtn3("comment", revs[1], 'sorry dave')), 0, false, false) +check(mtn3("comment", revs[1], 'sorry dave'), 0, false, false) srv:sync("testbranch", 3) srv:sync("testbranch", 2) @@ -56,8 +56,8 @@ chksy(3, mtn2) -- And check for that extra cert -check_same_stdout(cmd(mtn2("ls", "certs", revs[1])), - cmd(mtn3("ls", "certs", revs[1]))) +check_same_stdout(mtn2("ls", "certs", revs[1]), + mtn3("ls", "certs", revs[1])) srv:sync("testbranch", 3) ============================================================ --- tests/renaming_a_deleted_file/__driver__.lua 3e19173031269466aed55561cbf8a30bd5de735e +++ tests/renaming_a_deleted_file/__driver__.lua 501b87196920ba58a8a1f8899919d1a512c2e740 @@ -5,14 +5,14 @@ writefile("baz", "baz file") -- produce root -check(cmd(mtn("add", "foo")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) commit() root_r_sha = base_revision() root_f_sha = sha1("foo") -- produce move edge -check(cmd(mtn("add", "baz")), 0, false, false) -check(cmd(mtn("rename", "foo", "bar")), 0, false, false) +check(mtn("add", "baz"), 0, false, false) +check(mtn("rename", "foo", "bar"), 0, false, false) os.rename("foo", "bar") commit() @@ -21,15 +21,15 @@ os.remove("bar") -- make a delete edge on the move preimage -check(cmd(mtn("drop", "foo")), 0, false, false) +check(mtn("drop", "foo"), 0, false, false) commit() -- merge the del and the rename -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) -- check that the delete landed on the renamed target -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) os.rename("stdout", "manifest") check(qgrep("baz", "manifest")) check(not qgrep("bar", "manifest")) ============================================================ --- tests/renaming_a_directory/__driver__.lua d3136bb1f240bf8855276b841aa278f8f4c0869f +++ tests/renaming_a_directory/__driver__.lua ff5e5566bd6d5aae450febf324ded5ed8f3065a7 @@ -7,13 +7,13 @@ writefile("bleh", "bleh file") -- produce root -check(cmd(mtn("add", "foo")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) commit() root_r_sha = base_revision() root_f_sha = sha1("foo/foo") -- produce move edge -check(cmd(mtn("rename", "foo", "bar")), 0, false, false) +check(mtn("rename", "foo", "bar"), 0, false, false) os.rename("foo", "bar") commit() @@ -26,9 +26,9 @@ commit() -- merge the add and the rename -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) -check(cmd(mtn("automate", "get_manifest_of")), 0, true, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) +check(mtn("automate", "get_manifest_of"), 0, true, false) os.rename("stdout", "manifest") check(qgrep("bar/bar", "manifest")) check(qgrep("bar/foo", "manifest")) ============================================================ --- tests/renaming_a_file/__driver__.lua 98a709e7e3a932a7e8fc1283aeb3b5cbaa9f2fbe +++ tests/renaming_a_file/__driver__.lua 35d1d7058771cd2d329f33ee7fff869c4e203621 @@ -11,7 +11,7 @@ root_f_sha = sha1("foo") -- produce move edge -check(cmd(mtn("rename", "foo", "bar")), 0, false, false) +check(mtn("rename", "foo", "bar"), 0, false, false) copyfile("foo", "bar") commit() @@ -24,38 +24,38 @@ commit() -- merge the add and the rename -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) -check(cmd(mtn("automate", "get_manifest_of")), 0, true, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) +check(mtn("automate", "get_manifest_of"), 0, true, false) os.rename("stdout", "manifest") check(qgrep("bar", "manifest")) check(qgrep("bleh", "manifest")) -- rename a rename target -check(cmd(mtn("rename", "bleh", "blah")), 0, false, false) +check(mtn("rename", "bleh", "blah"), 0, false, false) check(qgrep("bleh", "_MTN/work")) check(qgrep("blah", "_MTN/work")) -check(cmd(mtn("rename", "blah", "blyh")), 0, false, false) +check(mtn("rename", "blah", "blyh"), 0, false, false) check(qgrep("bleh", "_MTN/work")) check(not qgrep("blah", "_MTN/work")) check(qgrep("blyh", "_MTN/work")) -- undo a rename -check(cmd(mtn("rename", "blyh", "bleh")), 0, false, false) +check(mtn("rename", "blyh", "bleh"), 0, false, false) check(not exists("_MTN/work")) -- move file before renaming it -check(cmd(mtn("status")), 0, false, false) +check(mtn("status"), 0, false, false) os.rename("bar", "barfoo") -check(cmd(mtn("rename", "bar", "barfoo")), 0, false, true) +check(mtn("rename", "bar", "barfoo"), 0, false, true) check(qgrep('renaming bar to barfoo in workspace manifest', "stderr")) -check(cmd(mtn("status")), 0, false, false) +check(mtn("status"), 0, false, false) -- move file to wrong place before renaming it os.rename("barfoo", "bar") -check(cmd(mtn("revert", ".")), 0, false, false) -check(cmd(mtn("status")), 0, false, false) +check(mtn("revert", "."), 0, false, false) +check(mtn("status"), 0, false, false) os.rename("bar", "barfoofoo") -check(cmd(mtn("rename", "bar", "barfoo")), 0, false, true) +check(mtn("rename", "bar", "barfoo"), 0, false, true) check(qgrep('renaming bar to barfoo in workspace manifest', "stderr")) +check(mtn("status"), 1, false, false) -check(cmd(mtn("status")), 1, false, false) ============================================================ --- tests/renaming_a_patched_file/__driver__.lua 32ee3c13f0f2ef0aad23ec544da1aaa7b00d0ae0 +++ tests/renaming_a_patched_file/__driver__.lua f67c4c450d5d65e951d045e6547681341ec38d1e @@ -5,13 +5,13 @@ writefile("bleh", "bleh file") -- produce root -check(cmd(mtn("add", "foo")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) commit() root_r_sha = base_revision() root_f_sha = sha1("foo") -- produce move edge -check(cmd(mtn("rename", "foo", "bar")), 0, false, false) +check(mtn("rename", "foo", "bar"), 0, false, false) os.rename("foo", "bar") commit() @@ -24,11 +24,11 @@ commit() -- merge the delta and the rename -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) -- check that the delta landed on the renamed target -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) os.rename("stdout", "manifest") check(qgrep("bar", "manifest")) check(not qgrep("foo", "manifest")) ============================================================ --- tests/renaming_and_editing_a_file/__driver__.lua 7fcfa15642b32a2fa515afa84e1b54df0323d53b +++ tests/renaming_and_editing_a_file/__driver__.lua 650e40f16b0106da5727988543b69617aefba61a @@ -9,39 +9,39 @@ -- produce root os.rename("foo1", "foo") -check(cmd(mtn("add", "foo")), 0, false, false) -check(cmd(mtn("--branch=testbranch", "commit", "--message=root")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) +check(mtn("--branch=testbranch", "commit", "--message=root"), 0, false, false) root_r_sha=base_revision() root_f_sha=sha1("foo") -- produce 4-step path with move in the middle rename_over("foo2", "foo") -check(cmd(mtn("commit", "--message=edit-foo")), 0, false, false) -check(cmd(mtn("rename", "foo", "bar")), 0, false, false) +check(mtn("commit", "--message=edit-foo"), 0, false, false) +check(mtn("rename", "foo", "bar"), 0, false, false) rename_over("bar1", "bar") -check(cmd(mtn("commit", "--message=rename-to-bar")), 0, false, false) +check(mtn("commit", "--message=rename-to-bar"), 0, false, false) rename_over("bar2", "bar") -check(cmd(mtn("commit", "--message=edit-bar")), 0, false, false) +check(mtn("commit", "--message=edit-bar"), 0, false, false) -- revert to root probe_node("foo", root_r_sha, root_f_sha) os.remove("bar") -- make a simple add edge -check(cmd(mtn("add", "bleh")), 0, false, false) -check(cmd(mtn("commit", "--message=blah-blah")), 0, false, false) +check(mtn("add", "bleh"), 0, false, false) +check(mtn("commit", "--message=blah-blah"), 0, false, false) -- merge the add and the rename -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) -check(cmd(mtn("automate", "get_manifest_of")), 0, true, false) +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) +check(mtn("automate", "get_manifest_of"), 0, true, false) os.rename("stdout", "manifest") check(qgrep("bar", "manifest")) check(qgrep("bleh", "manifest")) check(not qgrep("foo", "manifest")) -- now the moment of truth: do we *think* there was a rename? -check(cmd(mtn("diff", "--revision", root_r_sha)), 0, true, false) +check(mtn("diff", "--revision", root_r_sha), 0, true, false) check(qgrep("rename", "stdout")) os.remove("bar") ============================================================ --- tests/repeatedly_exchanging_work_via_netsync/__driver__.lua 3e6428db18e19dc383f3fe3cef9b4f2b28b6fc84 +++ tests/repeatedly_exchanging_work_via_netsync/__driver__.lua c4be0ca44b72f23097f18b6e0a99127237759bc1 @@ -19,15 +19,15 @@ commit("testbranch") ver[2] = base_revision() -check(cmd(mtn("--branch=testbranch", "merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("--branch=testbranch", "merge"), 0, false, false) +check(mtn("update"), 0, false, false) ver[3] = base_revision() netsync.pull("testbranch") -check_same_stdout(cmd(mtn("automate", "graph")), cmd(mtn2("automate", "graph"))) +check_same_stdout(mtn("automate", "graph"), mtn2("automate", "graph")) for i = 1,3 do - check_same_stdout(cmd(mtn("ls", "certs", ver[i])), - cmd(mtn2("ls", "certs", ver[i]))) + check_same_stdout(mtn("ls", "certs", ver[i]), + mtn2("ls", "certs", ver[i])) end ============================================================ --- tests/revert_file_to_base_revision/__driver__.lua 15e25506eba289749c75a219f1f337092634d79c +++ tests/revert_file_to_base_revision/__driver__.lua 3938aaef0d2b8aea9e80f164edd46b1d1b2f9786 @@ -10,7 +10,7 @@ writefile("testfile0", "squirrils monkeys dingos\n") check(qgrep("squirrils", "testfile0")) -check(cmd(mtn("revert", "testfile0")), 0, false, false) +check(mtn("revert", "testfile0"), 0, false, false) check(not qgrep("squirrils", "testfile0")) v2 = sha1("testfile0") check(v1 == v2) @@ -19,23 +19,23 @@ -- check reverting the whole tree writefile("testfile0", "squirrils monkeys dingos\n") -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("testfile0", "stdout")) -check(cmd(mtn("revert", ".")), 0, false, false) +check(mtn("revert", "."), 0, false, false) check(not exists("_MTN/work")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(not qgrep("testfile0", "stdout")) -- check reverting a delete -check(cmd(mtn("drop", "testfile0")), 0, false, false) +check(mtn("drop", "testfile0"), 0, false, false) check(qgrep("testfile0", "_MTN/work")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("testfile0", "stdout")) -check(cmd(mtn("revert", ".")), 0, false, false) +check(mtn("revert", "."), 0, false, false) check(not exists("_MTN/work")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(not qgrep("testfile0", "stdout")) @@ -44,13 +44,13 @@ f = io.open("testfile0", "a") f:write("liver and maude\n") f:close() -check(cmd(mtn("drop", "testfile0")), 0, false, false) +check(mtn("drop", "testfile0"), 0, false, false) check(qgrep("testfile0", "_MTN/work")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("testfile0", "stdout")) -check(cmd(mtn("revert", "testfile0")), 0, false, false) +check(mtn("revert", "testfile0"), 0, false, false) check(not exists("_MTN/work")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(not qgrep("testfile0", "stdout")) v3 = sha1("testfile0") check(v1 == v3) @@ -59,64 +59,64 @@ addfile("testfile1", "squirrils monkeys dingos\n") check(qgrep("testfile1", "_MTN/work")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("testfile1", "stdout")) -check(cmd(mtn("revert", ".")), 0, false, false) +check(mtn("revert", "."), 0, false, false) check(not exists("_MTN/work")) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(not qgrep("testfile1", "stdout")) -- check reverting a directory mkdir("sub") addfile("sub/testfile2", "maude\n") -check(cmd(mtn("commit", "--message=new file")), 0, false, false) +check(mtn("commit", "--message=new file"), 0, false, false) writefile("sub/testfile2", "liver\n") -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("sub", "stdout")) -check(cmd(mtn("revert", "sub")), 0, false, false) -check(cmd(mtn("status")), 0, true) +check(mtn("revert", "sub"), 0, false, false) +check(mtn("status"), 0, true) check(not qgrep("sub", "stdout")) -- it also shouldn't matter how we spell the subdirectory name writefile("sub/testfile2", "liver\n") -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("sub", "stdout")) -check(cmd(mtn("revert", "sub/")), 0, false, false) -check(cmd(mtn("status")), 0, true) +check(mtn("revert", "sub/"), 0, false, false) +check(mtn("status"), 0, true) check(not qgrep("sub", "stdout")) -- check reverting a missing file -check(cmd(mtn("revert", ".")), 0, false, false) +check(mtn("revert", "."), 0, false, false) os.remove("testfile0") -check(cmd(mtn("status")), 1, false, false) -check(cmd(mtn("revert", "testfile0")), 0, true, false) -check(cmd(mtn("status")), 0, false, false) +check(mtn("status"), 1, false, false) +check(mtn("revert", "testfile0"), 0, true, false) +check(mtn("status"), 0, false, false) -- check reverting some changes and leaving others -check(cmd(mtn("revert", ".")), 0, false, false) -check(cmd(mtn("status")), 0, true) +check(mtn("revert", "."), 0, false, false) +check(mtn("status"), 0, true) copyfile("testfile0", "foofile0") copyfile("sub/testfile2", "sub/foofile2") -check(cmd(mtn("rename", "testfile0", "foofile0")), 0, false, false) -check(cmd(mtn("rename", "sub/testfile2", "sub/foofile2")), 0, false, false) +check(mtn("rename", "testfile0", "foofile0"), 0, false, false) +check(mtn("rename", "sub/testfile2", "sub/foofile2"), 0, false, false) -check(cmd(mtn("status")), 0, true) +check(mtn("status"), 0, true) check(qgrep("foofile0", "stdout")) check(qgrep("foofile2", "stdout")) check(exists("_MTN/work")) -check(cmd(mtn("revert", "sub/foofile2")), 0, true) -check(cmd(mtn("status")), 0, true) +check(mtn("revert", "sub/foofile2"), 0, true) +check(mtn("status"), 0, true) check(qgrep("foofile0", "stdout")) check(not qgrep("foofile2", "stdout")) check(exists("_MTN/work")) -check(cmd(mtn("revert", "foofile0")), 0, true) -check(cmd(mtn("status")), 0, true) +check(mtn("revert", "foofile0"), 0, true) +check(mtn("status"), 0, true) check(not qgrep("foofile0", "stdout")) check(not qgrep("foofile2", "stdout")) check(not exists("_MTN/work")) @@ -124,7 +124,7 @@ -- check that "revert" by itself just prints usage. writefile("foofile0", "blah\n") v1 = sha1("foofile0") -check(cmd(mtn("revert")), 2, false, false) +check(mtn("revert"), 2, false, false) v2 = sha1("foofile0") check(v1 == v2) ============================================================ --- tests/scanning_trees/__driver__.lua a66978e67c950281be7dbc3999b751bf60de6310 +++ tests/scanning_trees/__driver__.lua f98578fc16ef652ad5b5bbba5387ddc05a98795a @@ -9,8 +9,8 @@ getfile("manifest") canonicalize("manifest") -check(cmd(mtn("add", "testfile0", "foo")), 0, false, false) +check(mtn("add", "testfile0", "foo"), 0, false, false) commit() -check(cmd(mtn("automate", "get_manifest_of")), 0, true) +check(mtn("automate", "get_manifest_of"), 0, true) canonicalize("stdout") check(samefile("stdout", "manifest")) ============================================================ --- tests/schema_migration/__driver__.lua 8e0ee3155b00e70efcd15f5b210330388ddf5b9f +++ tests/schema_migration/__driver__.lua bdfc5b96c09274e280f740759e412a595f77a560 @@ -29,46 +29,46 @@ -- We don't want the standard db, we want full control ourselves remove("test.db") remove_recursive("keys") -check(cmd(mtn("db", "init"))) +check(mtn("db", "init")) -- Put some random keys in, with and without corresponding private keys getfile("migrate_keys", "stdin") -check(cmd(mtn("read")), 0, false, false, true) +check(mtn("read"), 0, false, false, true) addfile("testfile1", "f1v1\n") addfile("testfile2", "f2v1\n") -check(cmd(mtn("attr", "set", "testfile1", "testfile1_key", "initial_value")), 0, false, false) -check(cmd(mtn("attr", "set", ".", "dir_key", "initial_value")), 0, false, false) -check(cmd(mtn("commit", "--branch=testbranch1", "--date=1999-01-01T12:00:00", "--message=blah-blah")), 0, false, false) +check(mtn("attr", "set", "testfile1", "testfile1_key", "initial_value"), 0, false, false) +check(mtn("attr", "set", ".", "dir_key", "initial_value"), 0, false, false) +check(mtn("commit", "--branch=testbranch1", "--date=1999-01-01T12:00:00", "--message=blah-blah"), 0, false, false) rev = base_revision() -check(cmd(mtn("cert", rev, "somekey", "somevalue")), 0, false, false) +check(mtn("cert", rev, "somekey", "somevalue"), 0, false, false) writefile("testfile1", "f1v2\n") addfile("testfile3", "f3v1\n") -check(cmd(mtn("attr", "drop", "testfile1", "testfile1_key")), 0, false, false) -check(cmd(mtn("attr", "set", ".", "dir_key", "new_value")), 0, false, false) -check(cmd(mtn("commit", "--branch=testbranch2", "--date=2000-01-01T12:00:00", "--message=blah-blah")), 0, false, false) +check(mtn("attr", "drop", "testfile1", "testfile1_key"), 0, false, false) +check(mtn("attr", "set", ".", "dir_key", "new_value"), 0, false, false) +check(mtn("commit", "--branch=testbranch2", "--date=2000-01-01T12:00:00", "--message=blah-blah"), 0, false, false) revert_to(rev) writefile("testfile2", "f2v2\n") addfile("testfile4", "f4v1\n") -check(cmd(mtn("commit", "--branch=testbranch1", "--date=2001-01-01T12:00:00", "--message=blah-blah")), 0, false, false) +check(mtn("commit", "--branch=testbranch1", "--date=2001-01-01T12:00:00", "--message=blah-blah"), 0, false, false) -check(cmd(mtn("propagate", "--date=2002-01-01T12:00:00", "testbranch2", "testbranch1")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("propagate", "--date=2002-01-01T12:00:00", "testbranch2", "testbranch1"), 0, false, false) +check(mtn("update"), 0, false, false) -check(cmd(mtn("drop", "testfile1")), 0, false, false) +check(mtn("drop", "testfile1"), 0, false, false) writefile("testfile4", "f4v2\n") -check(cmd(mtn("commit", "--branch=testbranch3", "--date=2003-01-01T12:00:00", "--message=blah-blah")), 0, false, false) +check(mtn("commit", "--branch=testbranch3", "--date=2003-01-01T12:00:00", "--message=blah-blah"), 0, false, false) rename("test.db", "latest.mtn") if debugging then - check(cmd(mtn("--db=latest.mtn", "db", "dump")), 0, true, false) + check(mtn("--db=latest.mtn", "db", "dump"), 0, true, false) rename("stdout", "latest.mtn.dumped") - check(cmd(mtn("--db=latest.mtn", "db", "version")), 0, true, false) + check(mtn("--db=latest.mtn", "db", "version"), 0, true, false) local ver = string.gsub(readfile("stdout"), "^.*: (.*)%s$", "%1") rename("latest.mtn.dumped", ver..".mtn.dumped") end @@ -80,12 +80,12 @@ function check_migrate_from(id) -- id.dumped is a 'db dump' of a db with schema "id" getfile(id..".mtn.dumped", "stdin") - check(cmd(mtn("--db="..id..".mtn", "db", "load")), 0, false, false, true) + check(mtn("--db="..id..".mtn", "db", "load"), 0, false, false, true) -- check that the version's correct - check(cmd(mtn("--db="..id..".mtn", "db", "version")), 0, true, false) + check(mtn("--db="..id..".mtn", "db", "version"), 0, true, false) check(qgrep(id, "stdout")) -- migrate it - check(cmd(mtn("--db="..id..".mtn", "db", "migrate")), 0, false, false) + check(mtn("--db="..id..".mtn", "db", "migrate"), 0, false, false) check_same_db_contents(id..".mtn", "latest.mtn") end ============================================================ --- tests/single_character_filename_support/__driver__.lua f606b0b2e75e3900a5d5344ecb762c53eb9d1521 +++ tests/single_character_filename_support/__driver__.lua c7021579482c50f1b617fc60adbc308b7345e2f7 @@ -6,12 +6,12 @@ commit() revs.a = base_revision() -check(cmd(mtn("rename", "a", "b")), 0, false, false) +check(mtn("rename", "a", "b"), 0, false, false) os.rename("a", "b") commit() revs.b = base_revision() -check(cmd(mtn("drop", "b")), 0, false, false) +check(mtn("drop", "b"), 0, false, false) remove("b") commit() revs.null = base_revision() @@ -20,7 +20,7 @@ {revs.b, false, true}, {revs.null, false, false}} do remove_recursive("_MTN") - check(cmd(mtn("checkout", "--revision", x[1], "co-dir")), 0, false, false) + check(mtn("checkout", "--revision", x[1], "co-dir"), 0, false, false) check(exists("co-dir/a") == x[2]) check(exists("co-dir/b") == x[3]) remove_recursive("co-dir") ============================================================ --- tests/single_manifest_netsync/__driver__.lua 830f2ffecf6cb342af16a385146a750fede897de +++ tests/single_manifest_netsync/__driver__.lua 337cc66d8318ef7f7aec4b37ea1344e3d135d06d @@ -1,16 +1,16 @@ mtn_setup() netsync.setup() writefile("testfile", "version 0 of test file") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit("testbranch") f_ver = sha1("testfile") ver = base_revision() netsync.pull("testbranch") -check(cmd(mtn2("ls", "certs", ver)), 0, true) +check(mtn2("ls", "certs", ver), 0, true) rename("stdout", "certs") check(qgrep("date", "certs")) check(qgrep("author", "certs")) @@ -18,16 +18,16 @@ check(qgrep("changelog", "certs")) check(not qgrep("bad", "certs")) -check(cmd(mtn2("automate", "get_revision", ver)), 0, true) +check(mtn2("automate", "get_revision", ver), 0, true) canonicalize("stdout") check(sha1("stdout") == ver) -check(cmd(mtn2("automate", "get_file", f_ver)), 0, true) +check(mtn2("automate", "get_file", f_ver), 0, true) canonicalize("stdout") check(sha1("stdout") == f_ver) -check(cmd(mtn("db", "info")), 0, true) +check(mtn("db", "info"), 0, true) info1 = sha1("stdout") -check(cmd(mtn2("db", "info")), 0, true) +check(mtn2("db", "info"), 0, true) info2 = sha1("stdout") check(info1 == info2) ============================================================ --- tests/subdirectory_restrictions/__driver__.lua 90273b74c39f59bba9b57ed2c1ab6115645f3b35 +++ tests/subdirectory_restrictions/__driver__.lua 353202bac216de08ce38f9a86a6038d7f1277e99 @@ -7,8 +7,8 @@ writefile("foo/foo.txt", "file foo.txt in dir foo") writefile("bar/bar.txt", "file bar.txt in dir bar") -check(cmd(mtn("add", "foo")), 0, false, false) -check(cmd(mtn("add", "bar")), 0, false, false) +check(mtn("add", "foo"), 0, false, false) +check(mtn("add", "bar"), 0, false, false) commit() @@ -24,34 +24,34 @@ -- - which use add_restriction and in_restriction through -- restrict_patch_set -check(cmd(mtn("status")), 0, true, 0) +check(mtn("status"), 0, true, 0) check(qgrep("foo/foo", "stdout")) check(qgrep("bar/bar", "stdout")) chdir("foo") -check(cmd(mtn("--norc", "status")), 0, true) +check(mtn("--norc", "status"), 0, true) check(qgrep("foo/foo", "stdout")) check(qgrep("bar/bar", "stdout")) -check(cmd(mtn("--norc", "status", ".")), 0, true) +check(mtn("--norc", "status", "."), 0, true) check(qgrep("foo/foo", "stdout")) check(not qgrep("bar/bar", "stdout")) -check(cmd(mtn("--norc", "status", "..")), 0, true) +check(mtn("--norc", "status", ".."), 0, true) check(qgrep("foo/foo", "stdout")) check(qgrep("bar/bar", "stdout")) chdir("..") chdir("bar") -check(cmd(mtn("--norc", "status")), 0, true) +check(mtn("--norc", "status"), 0, true) check(qgrep("foo/foo", "stdout")) check(qgrep("bar/bar", "stdout")) -check(cmd(mtn("--norc", "status", ".")), 0, true) +check(mtn("--norc", "status", "."), 0, true) check(not qgrep("foo/foo", "stdout")) check(qgrep("bar/bar", "stdout")) -check(cmd(mtn("--norc", "status", "..")), 0, true) +check(mtn("--norc", "status", ".."), 0, true) check(qgrep("foo/foo", "stdout")) check(qgrep("bar/bar", "stdout")) chdir("..") ============================================================ --- tests/tags_and_tagging_of_revisions/__driver__.lua 6bfccf13721299af333b1a8abea99594ca9d562c +++ tests/tags_and_tagging_of_revisions/__driver__.lua dc29bb0db25ad55d49d44c7923eb57c3c6e37a2b @@ -6,34 +6,34 @@ writefile("file3", "file 3") -- make sure a tag of a nonexistent revision fails -check(cmd(mtn("tag", "af2f6c1f3b7892672357a1018124ee80c752475d", "foo")), 1, false, false) +check(mtn("tag", "af2f6c1f3b7892672357a1018124ee80c752475d", "foo"), 1, false, false) revs = {} -- make and tag revision 1 -check(cmd(mtn("add", "file1")), 0, false, false) +check(mtn("add", "file1"), 0, false, false) commit() revs[1] = base_revision() -check(cmd(mtn("tag", revs[1], "tag1")), 0, false, false) +check(mtn("tag", revs[1], "tag1"), 0, false, false) -- make and tag revision 2 -check(cmd(mtn("add", "file2")), 0, false, false) +check(mtn("add", "file2"), 0, false, false) commit() revs[2] = base_revision() -check(cmd(mtn("tag", revs[2], "tag2")), 0, false, false) +check(mtn("tag", revs[2], "tag2"), 0, false, false) -- make and tag revision 3 -check(cmd(mtn("add", "file3")), 0, false, false) +check(mtn("add", "file3"), 0, false, false) commit() revs[3] = base_revision() -check(cmd(mtn("tag", revs[3], "tag3")), 0, true, true) +check(mtn("tag", revs[3], "tag3"), 0, true, true) -- check tags created above -check(cmd(mtn("ls", "tags")), 0, true, false) +check(mtn("ls", "tags"), 0, true, false) check(qgrep("tag1", "stdout")) check(qgrep("tag2", "stdout")) check(qgrep("tag3", "stdout")) @@ -54,7 +54,7 @@ remove("file2") remove("file3") - check(cmd(mtn("co", "--revision=tag"..i, ".")), 0, false, false) + check(mtn("co", "--revision=tag"..i, "."), 0, false, false) check(base_revision() == revs[i]) for j = 1,3 do check(exists("file"..j) == x[j]) ============================================================ --- tests/test_a_merge/__driver__.lua 17cae767d80b9c4b1eec42fc85c367a8e60d2c63 +++ tests/test_a_merge/__driver__.lua 56aeb71615373818f2e6a3e01a07d8f3545c48d0 @@ -15,7 +15,7 @@ getfile("correct") copyfile("parent", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit(testbranch) parent = base_revision() @@ -27,7 +27,7 @@ copyfile("right", "testfile") commit() -check(cmd(mtn("merge")), 0, false, false) +check(mtn("merge"), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("testfile", "correct")) ============================================================ --- tests/test_a_merge_2/__driver__.lua 36bed683bb6f955ae6ed03f9f8b4f507ab0c3cca +++ tests/test_a_merge_2/__driver__.lua 3f31d6570b3f7b7ab7fc26f373a1b1c31283fe6b @@ -25,7 +25,7 @@ getfile("correct") copyfile("parent", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() parent = base_revision() @@ -37,7 +37,7 @@ copyfile("right", "testfile") commit() -check(cmd(mtn("merge")), 0, false, false) +check(mtn("merge"), 0, false, false) -check(cmd(mtn("update")), 0, false, false) +check(mtn("update"), 0, false, false) check(samefile("testfile", "correct")) ============================================================ --- tests/trust_hooks_and_'trusted'_command/__driver__.lua 2fb2c800231ec5cfaedb2c6d5aa261c4e23af59b +++ tests/trust_hooks_and_'trusted'_command/__driver__.lua 317ce678a1bd355e4c39534e62537424eda07992 @@ -1,8 +1,8 @@ mtn_setup() function trusted(rev, name, value, ...) -- ... is signers - check(cmd(mtn("trusted", rev, name, value, unpack(arg))), 0, true, false) + check(mtn("trusted", rev, name, value, unpack(arg)), 0, true, false) local t = qgrep(" trusted", "stdout") local u = qgrep(" untrusted", "stdout") or qgrep(" UNtrusted", "stdout") check(t ~= u) ============================================================ --- tests/update_with_multiple_candidates/__driver__.lua 6023653c9e719109c4b94f1fad13105a8d5b522c +++ tests/update_with_multiple_candidates/__driver__.lua 8e8fefe20f694600a91315bab132218097a3feae @@ -22,7 +22,7 @@ -- There are two possible candidates, so our update should fail. remove("file1") -check(cmd(mtn("update")), 1, false, true) +check(mtn("update"), 1, false, true) check(not exists("file1")) -- Make sure that the failure message listed the possibilities check(qgrep(left, "stderr")) @@ -38,7 +38,7 @@ revert_to(anc) remove("file1") remove("file2") -check(cmd(mtn("update")), 1, false, true) +check(mtn("update"), 1, false, true) check(not exists("file1")) check(not exists("file2")) -- Make sure that the failure message listed the possibilities ============================================================ --- tests/updating_from_a_merge_which_adds_a_file/__driver__.lua 14c179004eb8d2a7179f077e17a1d9d22d21d733 +++ tests/updating_from_a_merge_which_adds_a_file/__driver__.lua 9de36d12c49f6b36cb33978609f2c86412376199 @@ -1,9 +1,9 @@ mtn_setup() writefile("a") -check(cmd(mtn("add", "a")), 0, false, false) +check(mtn("add", "a"), 0, false, false) commit() root_r_sha = base_revision() @@ -12,7 +12,7 @@ mkdir("b") writefile("b/c") -check(cmd(mtn("add", "b")), 0, false, false) +check(mtn("add", "b"), 0, false, false) commit() probe_node("a", root_r_sha, root_f_sha) @@ -20,8 +20,8 @@ remove_recursive("b") writefile("d") -check(cmd(mtn("add", "d")), 0, false, false) +check(mtn("add", "d"), 0, false, false) commit() +check(mtn("merge"), 0, false, false) +check(mtn("update"), 0, false, false) -check(cmd(mtn("merge")), 0, false, false) -check(cmd(mtn("update")), 0, false, false) ============================================================ --- tests/updating_to_a_given_revision/__driver__.lua 12fa7e799cfeed20b60a2dc34a02e32890240809 +++ tests/updating_to_a_given_revision/__driver__.lua 2e9125c5c94c5c87a921ff6cb143918dcc8cd489 @@ -12,7 +12,7 @@ -- Create root revision. copyfile("root", "testfile") -check(cmd(mtn("add", "testfile")), 0, false, false) +check(mtn("add", "testfile"), 0, false, false) commit() revs.root = base_revision() @@ -27,11 +27,11 @@ revs.left = base_revision() -- Test going backward in the revision tree. -check(cmd(mtn("update", "--revision", revs.root)), 0, false, false) +check(mtn("update", "--revision", revs.root), 0, false, false) check(samefile("testfile", "root")) -- Test going forward in the revision tree. -check(cmd(mtn("update", "--revision", revs.middle)), 0, false, false) +check(mtn("update", "--revision", revs.middle), 0, false, false) check(samefile("testfile", "middle")) -- Create a fork from middle. @@ -40,10 +40,10 @@ revs.right = base_revision() -- Test going from the right left to the left leaf via the common ancestor. -check(cmd(mtn("update", "--revision", revs.left)), 0, false, false) +check(mtn("update", "--revision", revs.left), 0, false, false) check(samefile("testfile", "left-leaf")) -- Test that workspace changes are kept while going backward. copyfile("modified-left-leaf", "testfile") -check(cmd(mtn("update", "--revision", revs.root)), 0, false, false) +check(mtn("update", "--revision", revs.root), 0, false, false) check(samefile("testfile", "modified-root")) ============================================================ --- testsuite.at 52399f271c1496a2836dc4dc9b609c7dbe7793ab +++ testsuite.at 2bcc5a412f1cb76ab24165ad2697e8f881c368a2 @@ -608,32 +608,32 @@ # include all the sub-tests we're going to use -m4_include(tests/t_drop_rename_patch.at) -m4_include(tests/t_cmdline_options.at) -m4_include(tests/t_log_nonexistent.at) -m4_include(tests/t_crlf.at) -m4_include(tests/t_netsync_diffbranch.at) -m4_include(tests/t_netsync_nocerts.at) -m4_include(tests/t_check_same_db_contents.at) -m4_include(tests/t_merge_ancestor.at) -m4_include(tests/t_propagate_desc.at) -m4_include(tests/t_propagate_anc.at) -m4_include(tests/t_status_missing.at) -m4_include(tests/t_persistent_server_keys_2.at) -m4_include(tests/t_update_1.at) -m4_include(tests/t_vcheck.at) -m4_include(tests/t_db_with_dots.at) -m4_include(tests/t_subdir_add.at) -m4_include(tests/t_subdir_drop.at) -m4_include(tests/t_subdir_revert.at) -m4_include(tests/t_subdir_rename.at) -m4_include(tests/t_subdir_attr.at) -m4_include(tests/t_lca_1.at) -m4_include(tests/t_update_2.at) -m4_include(tests/t_rename_dir_cross_level.at) -m4_include(tests/t_rename_added_in_rename.at) -m4_include(tests/t_rename_conflict.at) -m4_include(tests/t_rename_dir_patch.at) +#m4_include(tests/t_drop_rename_patch.at) +#m4_include(tests/t_cmdline_options.at) +#m4_include(tests/t_log_nonexistent.at) +#m4_include(tests/t_crlf.at) +#m4_include(tests/t_netsync_diffbranch.at) +#m4_include(tests/t_netsync_nocerts.at) +#m4_include(tests/t_check_same_db_contents.at) +#m4_include(tests/t_merge_ancestor.at) +#m4_include(tests/t_propagate_desc.at) +#m4_include(tests/t_propagate_anc.at) +#m4_include(tests/t_status_missing.at) +#m4_include(tests/t_persistent_server_keys_2.at) +#m4_include(tests/t_update_1.at) +#m4_include(tests/t_vcheck.at) +#m4_include(tests/t_db_with_dots.at) +#m4_include(tests/t_subdir_add.at) +#m4_include(tests/t_subdir_drop.at) +#m4_include(tests/t_subdir_revert.at) +#m4_include(tests/t_subdir_rename.at) +#m4_include(tests/t_subdir_attr.at) +#m4_include(tests/t_lca_1.at) +#m4_include(tests/t_update_2.at) +#m4_include(tests/t_rename_dir_cross_level.at) +#m4_include(tests/t_rename_added_in_rename.at) +#m4_include(tests/t_rename_conflict.at) +#m4_include(tests/t_rename_dir_patch.at) m4_include(tests/t_delete_dir_patch.at) m4_include(tests/t_revert_dirs.at) m4_include(tests/t_revert_rename.at) ============================================================ --- testsuite.lua f9ca814a66d5ff54286169fa0b10c8c607278063 +++ testsuite.lua 6c68826f2da27424628a0ce5be843955a443b258 @@ -1,11 +1,11 @@ #!./tester function safe_mtn(...) - return "mtn", "--norc", "--root=" .. test_root, unpack(arg) + return {"mtn", "--norc", "--root=" .. test_root, unpack(arg)} end --- function preexecute(...) --- return "valgrind", "--tool=memcheck", unpack(arg) +-- function preexecute(x) +-- return {"valgrind", "--tool=memcheck", unpack(x)} -- end function raw_mtn(...) @@ -30,13 +30,14 @@ "address@hidden", unpack(arg)) end -function commit(branch) +function commit(branch, message) if branch == nil then branch = "testbranch" end - check(cmd(mtn("commit", "--message=blah-blah", "--branch", branch)), 0, false, false) + if message == nil then message = "blah-blah" end + check(mtn("commit", "--message", message, "--branch", branch), 0, false, false) end function sha1(what) - check(cmd(safe_mtn("identify", what)), 0, false, false) + check(safe_mtn("identify", what), 0, false, false) return trim(readfile("ts-stdout")) end @@ -44,7 +45,7 @@ remove_recursive("_MTN.old") os.rename("_MTN", "_MTN.old") os.remove(filename) - check(cmd(mtn("checkout", "--revision", rsha, ".")), 0, false) + check(mtn("checkout", "--revision", rsha, "."), 0, false) os.rename("_MTN.old/options", "_MTN") check(base_revision() == rsha) check(sha1(filename) == fsha) @@ -55,9 +56,9 @@ getstdfile("tests/test_hooks.lua", "test_hooks.lua") getstdfile("tests/min_hooks.lua", "min_hooks.lua") - check(cmd(mtn("db", "init")), 0, false, false) - check(cmd(mtn("read", "test_keys")), 0, false, false) - check(cmd(mtn("setup", "--branch=testbranch", ".")), 0, false, false) + check(mtn("db", "init"), 0, false, false) + check(mtn("read", "test_keys"), 0, false, false) + check(mtn("setup", "--branch=testbranch", "."), 0, false, false) os.remove("test_keys") end @@ -91,8 +92,8 @@ function netsync.internal.client(srv, oper, pat, n, res) if pat == "" or pat == nil then pat = "*" end if n == nil then n = 2 end - check(cmd(mtn("--rcfile=netsync.lua", "--keydir=keys"..n, - "--db=test"..n..".db", oper, srv.address, pat)), + check(mtn("--rcfile=netsync.lua", "--keydir=keys"..n, + "--db=test"..n..".db", oper, srv.address, pat), res, false, false) end function netsync.internal.pull(srv, pat, n, res) srv:client("pull", pat, n, res) end @@ -117,7 +118,7 @@ end table.insert(args, "serve") table.insert(args, pat) - local out = bg({fn(unpack(args))}, false, false, false) + local out = bg(fn(unpack(args)), false, false, false) -- wait for "beginning service..." while fsize(out.prefix .. "stderr") == 0 do sleep(1) @@ -153,7 +154,7 @@ function addfile(filename, contents) if contents ~= nil then writefile(filename, contents) end - check(cmd(mtn("add", filename)), 0, false, false) + check(mtn("add", filename), 0, false, false) end function revert_to(rev, branch) @@ -161,9 +162,9 @@ os.rename("_MTN", "_MTN.old") if branch == nil then - check(cmd(mtn("checkout", "--revision", rev, ".")), 0, false) + check(mtn("checkout", "--revision", rev, "."), 0, false) else - check(cmd(mtn("checkout", "--branch", branch, "--revision", rev, ".")), 0, false) + check(mtn("checkout", "--branch", branch, "--revision", rev, "."), 0, false) end check(base_revision() == rev) end @@ -186,31 +187,31 @@ end function check_same_db_contents(db1, db2) - check_same_stdout(cmd(mtn("--db", db1, "ls", "keys")), - cmd(mtn("--db", db2, "ls", "keys"))) + check_same_stdout(mtn("--db", db1, "ls", "keys"), + mtn("--db", db2, "ls", "keys")) - check(cmd(mtn("--db", db1, "complete", "revision", "")), 0, true, false) + check(mtn("--db", db1, "complete", "revision", ""), 0, true, false) rename("stdout", "revs") - check(cmd(mtn("--db", db2, "complete", "revision", "")), 0, true, false) + check(mtn("--db", db2, "complete", "revision", ""), 0, true, false) check(samefile("stdout", "revs")) for rev in io.lines("revs") do rev = trim(rev) - check_same_stdout(cmd(mtn("--db", db1, "automate", "certs", rev)), - cmd(mtn("--db", db2, "automate", "certs", rev))) - check_same_stdout(cmd(mtn("--db", db1, "automate", "get_revision", rev)), - cmd(mtn("--db", db2, "automate", "get_revision", rev))) - check_same_stdout(cmd(mtn("--db", db1, "automate", "get_manifest_of", rev)), - cmd(mtn("--db", db2, "automate", "get_manifest_of", rev))) + check_same_stdout(mtn("--db", db1, "automate", "certs", rev), + mtn("--db", db2, "automate", "certs", rev)) + check_same_stdout(mtn("--db", db1, "automate", "get_revision", rev), + mtn("--db", db2, "automate", "get_revision", rev)) + check_same_stdout(mtn("--db", db1, "automate", "get_manifest_of", rev), + mtn("--db", db2, "automate", "get_manifest_of", rev)) end - check(cmd(mtn("--db", db1, "complete", "file", "")), 0, true, false) + check(mtn("--db", db1, "complete", "file", ""), 0, true, false) rename("stdout", "files") - check(cmd(mtn("--db", db2, "complete", "file", "")), 0, true, false) + check(mtn("--db", db2, "complete", "file", ""), 0, true, false) check(samefile("stdout", "files")) for file in io.lines("files") do file = trim(file) - check_same_stdout(cmd(mtn("--db", db1, "automate", "get_file", file)), - cmd(mtn("--db", db2, "automate", "get_file", file))) + check_same_stdout(mtn("--db", db1, "automate", "get_file", file), + mtn("--db", db2, "automate", "get_file", file)) end end @@ -332,3 +333,28 @@ table.insert(tests, "tests/schema_migration") table.insert(tests, "tests/database_dump_load") table.insert(tests, "tests/no-change_deltas_disappear") +table.insert(tests, "tests/merge((),_(drop_a,_rename_b_a,_patch_a))") +table.insert(tests, "tests/verification_of_command_line_options") +table.insert(tests, "tests/log_hides_deleted_renamed_files") +table.insert(tests, "tests/CRLF_line_normalization") +table.insert(tests, "tests/pull_a_netsync_branch_which_has_a_parent_from_another_branch") +table.insert(tests, "tests/(normal)_netsync_revision_with_no_certs") +table.insert(tests, "tests/check_same_db_contents_macro") +table.insert(tests, "tests/merge_rev_with_ancestor") +table.insert(tests, "tests/propagate_a_descendent") +table.insert(tests, "tests/propagate_an_ancestor") +table.insert(tests, "tests/status_with_missing_files") +table.insert(tests, "tests/(imp)_persistent_netsync_server_-_keys_2") +table.insert(tests, "tests/update_1") +table.insert(tests, "tests/(todo)_vcheck") +table.insert(tests, "tests/--db_with_parent_dir") +table.insert(tests, "tests/add_in_subdir") +table.insert(tests, "tests/(minor)_drop_in_subdir") +table.insert(tests, "tests/revert_in_subdirs") +table.insert(tests, "tests/rename_in_subdir") +table.insert(tests, "tests/attr_command_in_subdirs") +table.insert(tests, "tests/(normal)_update_across_discontinuity") +table.insert(tests, "tests/rename_dir_to_non-sibling") +table.insert(tests, "tests/merge_with_add,_rename_file,_and_rename_dir") +table.insert(tests, "tests/merge((rename_a_b),_(rename_a_c))") +table.insert(tests, "tests/merge((patch_foo_a),_(rename_foo__bar_))")