diff --git a/rake/meta/.hg/undo.desc b/rake/meta/.hg/undo.desc index 714e6fc..c9f39a8 100644 --- a/rake/meta/.hg/undo.desc +++ b/rake/meta/.hg/undo.desc @@ -1,2 +1,2 @@ 1 -gimport +hg-git-phases diff --git a/rake/rubylint/.hg/undo.desc b/rake/rubylint/.hg/undo.desc index 714e6fc..c9f39a8 100644 --- a/rake/rubylint/.hg/undo.desc +++ b/rake/rubylint/.hg/undo.desc @@ -1,2 +1,2 @@ 1 -gimport +hg-git-phases diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/bookmarks b/test/system/anarchism/roles/takel_anarchism/.hg/bookmarks index f6baca3..f3610a3 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/bookmarks +++ b/test/system/anarchism/roles/takel_anarchism/.hg/bookmarks @@ -1 +1 @@ -09b163f9918f127778ba0cee3b45e9f46e15a5c2 main +d460aab4d8f6d17c1633bcb3f1c49c102d821077 main diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/cache/branch2-served b/test/system/anarchism/roles/takel_anarchism/.hg/cache/branch2-served index ef320ab..8b1b797 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/cache/branch2-served +++ b/test/system/anarchism/roles/takel_anarchism/.hg/cache/branch2-served @@ -1,2 +1,2 @@ -09b163f9918f127778ba0cee3b45e9f46e15a5c2 25 -09b163f9918f127778ba0cee3b45e9f46e15a5c2 o default +d460aab4d8f6d17c1633bcb3f1c49c102d821077 26 +d460aab4d8f6d17c1633bcb3f1c49c102d821077 o default diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/cache/tags2-visible b/test/system/anarchism/roles/takel_anarchism/.hg/cache/tags2-visible index 6136f03..803fc25 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/cache/tags2-visible +++ b/test/system/anarchism/roles/takel_anarchism/.hg/cache/tags2-visible @@ -1 +1 @@ -25 09b163f9918f127778ba0cee3b45e9f46e15a5c2 +26 d460aab4d8f6d17c1633bcb3f1c49c102d821077 diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/dirstate b/test/system/anarchism/roles/takel_anarchism/.hg/dirstate index bb304f3..a0143c9 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/dirstate and b/test/system/anarchism/roles/takel_anarchism/.hg/dirstate differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git-mapfile b/test/system/anarchism/roles/takel_anarchism/.hg/git-mapfile index bf81ef3..6af4d97 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/git-mapfile +++ b/test/system/anarchism/roles/takel_anarchism/.hg/git-mapfile @@ -24,3 +24,4 @@ bc65cc8eb0c298319782076ca6528f375ebe1765 4d0c635906fcb6a55121c33998d79f690dfdc6c ce1636e958216154c4641d66d851fc1a16ea1204 40191ec3f14e931bc011d91d2d751b11dd761a05 dcc3c50c80af67456022b856f8d55bc5f363a33b 11f7c9e40a2e474a94ca536a15d336205abb0186 7e22f1a6cad5d376ce7feeec4e5c621cbc092e54 09b163f9918f127778ba0cee3b45e9f46e15a5c2 +9a708ad7968be377f521f820062ed74a085bb324 d460aab4d8f6d17c1633bcb3f1c49c102d821077 diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/27/52b2341d2ac4d1c13e1817fb705d78ab13aef0 b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/27/52b2341d2ac4d1c13e1817fb705d78ab13aef0 new file mode 100644 index 0000000..a401a48 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/27/52b2341d2ac4d1c13e1817fb705d78ab13aef0 differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/27/82529822e6b3d66f886bc730d98679db95837f b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/27/82529822e6b3d66f886bc730d98679db95837f new file mode 100644 index 0000000..03f1c62 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/27/82529822e6b3d66f886bc730d98679db95837f differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/82/fdaddd9f678cc4cac1ff8aa786dcc8d1c85e31 b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/82/fdaddd9f678cc4cac1ff8aa786dcc8d1c85e31 new file mode 100644 index 0000000..f2bbfd3 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/82/fdaddd9f678cc4cac1ff8aa786dcc8d1c85e31 differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/9a/708ad7968be377f521f820062ed74a085bb324 b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/9a/708ad7968be377f521f820062ed74a085bb324 new file mode 100644 index 0000000..ca87ad9 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/9a/708ad7968be377f521f820062ed74a085bb324 differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/b0/4042711254e94c58ffaa8081621a070d88b474 b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/b0/4042711254e94c58ffaa8081621a070d88b474 new file mode 100644 index 0000000..07daf58 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/b0/4042711254e94c58ffaa8081621a070d88b474 differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/da/faed36e7787c8e80d8e0281f15ba39db962dda b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/da/faed36e7787c8e80d8e0281f15ba39db962dda new file mode 100644 index 0000000..d1f6136 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/da/faed36e7787c8e80d8e0281f15ba39db962dda differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/e0/0b2cca9c739f46fba4fcbcd8e8dcc97421fb14 b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/e0/0b2cca9c739f46fba4fcbcd8e8dcc97421fb14 new file mode 100644 index 0000000..bd935b3 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/e0/0b2cca9c739f46fba4fcbcd8e8dcc97421fb14 differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/f0/4476959225ffe9ee94af4c223c5e6f3c48d261 b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/f0/4476959225ffe9ee94af4c223c5e6f3c48d261 new file mode 100644 index 0000000..60602f2 Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/f0/4476959225ffe9ee94af4c223c5e6f3c48d261 differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/f5/b7df528ab59c1ea873e3ea3845fb6e0faca56f b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/f5/b7df528ab59c1ea873e3ea3845fb6e0faca56f new file mode 100644 index 0000000..eef0d0e Binary files /dev/null and b/test/system/anarchism/roles/takel_anarchism/.hg/git/objects/f5/b7df528ab59c1ea873e3ea3845fb6e0faca56f differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/heads/main b/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/heads/main index fe6ab2a..815c6c1 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/heads/main +++ b/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/heads/main @@ -1 +1 @@ -181dbe72ac2fb34e36606072a20b9d3a248f9e03 +9a708ad7968be377f521f820062ed74a085bb324 diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/remotes/default/main b/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/remotes/default/main index eb5b4e6..815c6c1 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/remotes/default/main +++ b/test/system/anarchism/roles/takel_anarchism/.hg/git/refs/remotes/default/main @@ -1 +1 @@ -7e22f1a6cad5d376ce7feeec4e5c621cbc092e54 +9a708ad7968be377f521f820062ed74a085bb324 diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/merge/6257c930b4db766fb427f0337a518e2c92bdf754 b/test/system/anarchism/roles/takel_anarchism/.hg/merge/6257c930b4db766fb427f0337a518e2c92bdf754 deleted file mode 100644 index b3131de..0000000 --- a/test/system/anarchism/roles/takel_anarchism/.hg/merge/6257c930b4db766fb427f0337a518e2c92bdf754 +++ /dev/null @@ -1,16 +0,0 @@ -import takeltest - -testinfra_hosts = takeltest.hosts() - - -def test_takel_anarchism_system_fortune_greeting(host, testvars): - if 'fortune-anarchism' in testvars['takel_anarchism_deb_install_packages']: - with host.sudo(): - output = host.check_output('bash -c ". /root/.bashrc"') - assert '-- ' in output - - -def test_takel_root_system_includes_alias(host): - with host.sudo(): - output = host.check_output('bash -i -c "alias"') - assert 'alias l=' in output diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/merge/90291b75f952d5d8bf5ad4412e9638388b2ca39d b/test/system/anarchism/roles/takel_anarchism/.hg/merge/90291b75f952d5d8bf5ad4412e9638388b2ca39d deleted file mode 100644 index 982eb90..0000000 --- a/test/system/anarchism/roles/takel_anarchism/.hg/merge/90291b75f952d5d8bf5ad4412e9638388b2ca39d +++ /dev/null @@ -1,52 +0,0 @@ -import takeltest - -testinfra_hosts = takeltest.hosts() - - -def test_takel_anarchism_bashrc_source(host): - with host.sudo(): - file = host.file('/root/.bashrc') - expected = '''\ -if [ -d ~/.bashrc.d ]; then - for i in ~/.bashrc.d/*; do - if [ -r $i ]; then - . $i - fi - done - unset i -fi''' - assert expected in file.content_string - - -def test_takel_anarchism_bashrc_file(host): - with host.sudo(): - file = host.file('/root/.bashrc') - - assert file.exists - assert file.is_file - assert file.user == 'root' - assert file.group == 'root' - assert file.mode == 0o644 - - -def test_takel_anarchism_bashrc_directory(host): - with host.sudo(): - dir = host.file('/root/.bashrc.d') - - assert dir.exists - assert dir.is_directory - assert dir.user == 'root' - assert dir.group == 'root' - assert dir.mode == 0o755 - - -def test_takel_anarchism_bashrc_files(host, testvars): - bashrc_d_files = testvars['takel_anarchism_bashrc_d'] - for bashrc_d_file in bashrc_d_files: - with host.sudo(): - file = host.file(f"/root/.bashrc.d/{bashrc_d_file}") - assert file.exists - assert file.is_file - assert file.user == 'root' - assert file.group == 'root' - assert file.mode == 0o644 diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/merge/state b/test/system/anarchism/roles/takel_anarchism/.hg/merge/state deleted file mode 100644 index 90ac102..0000000 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/merge/state and /dev/null differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/merge/state2 b/test/system/anarchism/roles/takel_anarchism/.hg/merge/state2 deleted file mode 100644 index 0ca2e44..0000000 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/merge/state2 and /dev/null differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/store/00changelog.i b/test/system/anarchism/roles/takel_anarchism/.hg/store/00changelog.i index 3cd8852..3149288 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/store/00changelog.i and b/test/system/anarchism/roles/takel_anarchism/.hg/store/00changelog.i differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/store/00manifest.i b/test/system/anarchism/roles/takel_anarchism/.hg/store/00manifest.i index 4259a88..fcc5bd1 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/store/00manifest.i and b/test/system/anarchism/roles/takel_anarchism/.hg/store/00manifest.i differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/molecule.yml.i b/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/molecule.yml.i index 05c3fb6..9470b6b 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/molecule.yml.i and b/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/molecule.yml.i differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/system/test__takel__anarchism__system.py.i b/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/system/test__takel__anarchism__system.py.i index a3ea8a3..fd786d4 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/system/test__takel__anarchism__system.py.i and b/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/system/test__takel__anarchism__system.py.i differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/tests/test__takel__anarchism__bashrc.py.i b/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/tests/test__takel__anarchism__bashrc.py.i index cc20868..940e023 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/tests/test__takel__anarchism__bashrc.py.i and b/test/system/anarchism/roles/takel_anarchism/.hg/store/data/molecule/default/tests/test__takel__anarchism__bashrc.py.i differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/store/undo b/test/system/anarchism/roles/takel_anarchism/.hg/store/undo index ded57bb..e69de29 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/store/undo and b/test/system/anarchism/roles/takel_anarchism/.hg/store/undo differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/store/undo.backupfiles b/test/system/anarchism/roles/takel_anarchism/.hg/store/undo.backupfiles index 72f576e..0cfbf08 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/store/undo.backupfiles and b/test/system/anarchism/roles/takel_anarchism/.hg/store/undo.backupfiles differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.bookmarks b/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.bookmarks index bc6f93f..f3610a3 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.bookmarks +++ b/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.bookmarks @@ -1 +1 @@ -11f7c9e40a2e474a94ca536a15d336205abb0186 main +d460aab4d8f6d17c1633bcb3f1c49c102d821077 main diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.dirstate b/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.dirstate index 111ee94..f443621 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.dirstate and b/test/system/anarchism/roles/takel_anarchism/.hg/undo.backup.dirstate differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/undo.bookmarks b/test/system/anarchism/roles/takel_anarchism/.hg/undo.bookmarks index bc6f93f..f3610a3 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/undo.bookmarks +++ b/test/system/anarchism/roles/takel_anarchism/.hg/undo.bookmarks @@ -1 +1 @@ -11f7c9e40a2e474a94ca536a15d336205abb0186 main +d460aab4d8f6d17c1633bcb3f1c49c102d821077 main diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/undo.desc b/test/system/anarchism/roles/takel_anarchism/.hg/undo.desc index f22ce37..64c92b5 100644 --- a/test/system/anarchism/roles/takel_anarchism/.hg/undo.desc +++ b/test/system/anarchism/roles/takel_anarchism/.hg/undo.desc @@ -1,2 +1,2 @@ -25 -gimport +27 +hg-git-phases diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/undo.dirstate b/test/system/anarchism/roles/takel_anarchism/.hg/undo.dirstate index b065984..a0143c9 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/undo.dirstate and b/test/system/anarchism/roles/takel_anarchism/.hg/undo.dirstate differ diff --git a/test/system/anarchism/roles/takel_anarchism/.hg/wcache/manifestfulltextcache b/test/system/anarchism/roles/takel_anarchism/.hg/wcache/manifestfulltextcache index a2cd4da..2fe0491 100644 Binary files a/test/system/anarchism/roles/takel_anarchism/.hg/wcache/manifestfulltextcache and b/test/system/anarchism/roles/takel_anarchism/.hg/wcache/manifestfulltextcache differ diff --git a/test/system/anarchism/roles/takel_user/.hg/git/refs/heads/main b/test/system/anarchism/roles/takel_user/.hg/git/refs/heads/main index 12b554b..2fb7b0f 100644 --- a/test/system/anarchism/roles/takel_user/.hg/git/refs/heads/main +++ b/test/system/anarchism/roles/takel_user/.hg/git/refs/heads/main @@ -1 +1 @@ -880155f72e23c32922989d765a02ffd7e2070660 +616158eff3f5cb5855e247bec43fe04d09e7e291 diff --git a/test/system/anarchism/roles/takel_user/.hg/undo.backup.bookmarks b/test/system/anarchism/roles/takel_user/.hg/undo.backup.bookmarks index 58c83ee..92d42fc 100644 --- a/test/system/anarchism/roles/takel_user/.hg/undo.backup.bookmarks +++ b/test/system/anarchism/roles/takel_user/.hg/undo.backup.bookmarks @@ -1 +1 @@ -157a6d5c2b56409e29ce798789d008967ae8aee9 main +0ecedbe8618647ea6da681ac8b2efd0d94e49077 main diff --git a/test/system/anarchism/roles/takel_user/.hg/undo.desc b/test/system/anarchism/roles/takel_user/.hg/undo.desc index 4eb92d6..fd66854 100644 --- a/test/system/anarchism/roles/takel_user/.hg/undo.desc +++ b/test/system/anarchism/roles/takel_user/.hg/undo.desc @@ -1,2 +1,2 @@ 7 -gimport +hg-git-phases