From 9932e41e691178e17212d3c846e9df27100e468f Mon Sep 17 00:00:00 2001 From: Michal Jurosz Date: Thu, 8 Jan 2015 17:37:46 +0100 Subject: [PATCH] Enhance tests/test-out.sh and refresh docs/test-data --- docs/test-data/02-in-tree-before.txt | 268 +++++++++++++-------------- docs/test-data/06-run-unrar.txt | 3 + docs/test-data/07-in-tree-after.txt | 100 +++++----- docs/test-data/08-out-tree-after.txt | 113 +++++------ docs/test-data/09-state-after.txt | 26 +-- docs/test-data/11-in-tree-diff.txt | 139 ++++++++++++++ docs/test-data/12-out-tree-diff.txt | 63 +++++++ tests/test-out.sh | 8 +- 8 files changed, 467 insertions(+), 253 deletions(-) create mode 100644 docs/test-data/11-in-tree-diff.txt create mode 100644 docs/test-data/12-out-tree-diff.txt diff --git a/docs/test-data/02-in-tree-before.txt b/docs/test-data/02-in-tree-before.txt index 6e451bf..7fd5473 100644 --- a/docs/test-data/02-in-tree-before.txt +++ b/docs/test-data/02-in-tree-before.txt @@ -1,139 +1,139 @@ # Input tree of 'src_dir' (temp/test-data/in/) before auto-unrar run: temp/test-data/in/ -|-- subdir01-ok -| |-- test1-file.txt -| |-- test1.rar -| |-- test1.txt -| |-- test2.rar -| `-- test2.txt -|-- subdir02-ok -| |-- subdir2b -| | |-- test3.rar -| | |-- test3.txt -| | |-- test4.rar -| | `-- test4.txt -| |-- test5arch.part1.rar -| |-- test5arch.part2.rar -| |-- test5arch.part3.rar -| |-- test5arch.part4.rar -| |-- test5arch.part5.rar -| `-- test5.txt -|-- subdir03-ok -| |-- test6-dir\ -\ spaces.rar -| |-- test7-dir.r00 -| |-- test7-dir.r01 -| |-- test7-dir.r02 -| |-- test7-dir.r03 -| |-- test7-dir.r04 -| |-- test7-dir.r05 -| |-- test7-dir.r06 -| |-- test7-dir.r07 -| |-- test7-dir.r08 -| |-- test7-dir.r09 -| |-- test7-dir.r10 -| |-- test7-dir.r11 -| |-- test7-dir.r12 -| |-- test7-dir.r13 -| |-- test7-dir.r14 -| |-- test7-dir.r15 -| |-- test7-dir.r16 -| |-- test7-dir.r17 -| |-- test7-dir.r18 -| |-- test7-dir.r19 -| |-- test7-dir.r20 -| |-- test7-dir.r21 -| |-- test7-dir.r22 -| |-- test7-dir.r23 -| |-- test7-dir.r24 -| |-- test7-dir.r25 -| |-- test7-dir.r26 -| `-- test7-dir.rar -|-- subdir04-err -| |-- test8.txt -| |-- test9.part1.rar -| |-- test9.part2.rar -| |-- test9.part4.rar -| |-- test9.part5.rar -| `-- test9.part8.rar -|-- subdir05-err -| |-- subdir5A-file -| | `-- test10.txt -| |-- subdir5B-rar_error -| | |-- test11.part1.rar -| | |-- test11.part3.rar -| | `-- test11.part4.rar -| `-- test12.txt -|-- subdir06-err -| |-- subdir6A-rar_ok -| | |-- test13.txt -| | |-- test14.part1.rar -| | |-- test14.part2.rar -| | |-- test14.part3.rar -| | |-- test14.part4.rar -| | `-- test14.part5.rar -| |-- subdir6B-rar_error -| | |-- test15.r00 -| | |-- test15.r01 -| | |-- test15.r03 -| | `-- test15.rar -| `-- subdir6D-file -| `-- test16.txt -|-- subdir07-ok -| |-- test17-file.001 -| |-- test17-file.002 -| |-- test17-file.003 -| |-- test17-file.004 -| |-- test17-file.005 -| `-- test17-file.006 -|-- subdir08-err -| |-- test18-file.part1.rar -| |-- test18-file.part2.rar -| |-- test18-file.part3.rar -| |-- test19-file.part1.rar -| |-- test19-file.part3.rar -| |-- test20-file.r00 -| |-- test20-file.r01 -| |-- test20-file.rar -| |-- test21-file.r01 -| |-- test21-file.rar -| |-- test22-file.001 -| |-- test22-file.002 -| |-- test22-file.003 -| |-- test23-file.001 -| `-- test23-file.003 -|-- subdir09-err -| |-- test24-file.part3.rar -| |-- test24-file.part4.rar -| `-- test24-file.part6.rar -|-- subdir10-ok -| |-- ssdA -| | |-- test26-no-rar.txt -| | |-- test27-file.part1.rar -| | |-- test27-file.part2.rar -| | |-- test28-file.rar -| | `-- test29-no-rar.txt -| |-- ssdB -| | |-- test30-file.rar -| | |-- test31-no-rar.txt -| | |-- test32-file.part1.rar -| | `-- test32-file.part2.rar -| |-- ssdC -| | |-- test33-file.part1.rar -| | |-- test33-file.part2.rar -| | |-- test34-file.part1.rar -| | |-- test34-file.part2.rar -| | |-- test35-no-rar.txt -| | `-- test36-no-rar.txt -| |-- test25.txt -| `-- test37-no-rar.txt -|-- subdir11-ok -| |-- test38-file.part001.r00 -| |-- test38-file.part001.rar -| |-- test38-file.part002.part1.rar -| `-- test38-file.part002.part2.rar -|-- subdir12-ok -| `-- test39.txt -`-- test0-ok.txt +├── subdir01-ok +│   ├── test1-file.txt +│   ├── test1.rar +│   ├── test1.txt +│   ├── test2.rar +│   └── test2.txt +├── subdir02-ok +│   ├── subdir2b +│   │   ├── test3.rar +│   │   ├── test3.txt +│   │   ├── test4.rar +│   │   └── test4.txt +│   ├── test5arch.part1.rar +│   ├── test5arch.part2.rar +│   ├── test5arch.part3.rar +│   ├── test5arch.part4.rar +│   ├── test5arch.part5.rar +│   └── test5.txt +├── subdir03-ok +│   ├── test6-dir\ -\ spaces.rar +│   ├── test7-dir.r00 +│   ├── test7-dir.r01 +│   ├── test7-dir.r02 +│   ├── test7-dir.r03 +│   ├── test7-dir.r04 +│   ├── test7-dir.r05 +│   ├── test7-dir.r06 +│   ├── test7-dir.r07 +│   ├── test7-dir.r08 +│   ├── test7-dir.r09 +│   ├── test7-dir.r10 +│   ├── test7-dir.r11 +│   ├── test7-dir.r12 +│   ├── test7-dir.r13 +│   ├── test7-dir.r14 +│   ├── test7-dir.r15 +│   ├── test7-dir.r16 +│   ├── test7-dir.r17 +│   ├── test7-dir.r18 +│   ├── test7-dir.r19 +│   ├── test7-dir.r20 +│   ├── test7-dir.r21 +│   ├── test7-dir.r22 +│   ├── test7-dir.r23 +│   ├── test7-dir.r24 +│   ├── test7-dir.r25 +│   ├── test7-dir.r26 +│   └── test7-dir.rar +├── subdir04-err +│   ├── test8.txt +│   ├── test9.part1.rar +│   ├── test9.part2.rar +│   ├── test9.part4.rar +│   ├── test9.part5.rar +│   └── test9.part8.rar +├── subdir05-err +│   ├── subdir5A-file +│   │   └── test10.txt +│   ├── subdir5B-rar_error +│   │   ├── test11.part1.rar +│   │   ├── test11.part3.rar +│   │   └── test11.part4.rar +│   └── test12.txt +├── subdir06-err +│   ├── subdir6A-rar_ok +│   │   ├── test13.txt +│   │   ├── test14.part1.rar +│   │   ├── test14.part2.rar +│   │   ├── test14.part3.rar +│   │   ├── test14.part4.rar +│   │   └── test14.part5.rar +│   ├── subdir6B-rar_error +│   │   ├── test15.r00 +│   │   ├── test15.r01 +│   │   ├── test15.r03 +│   │   └── test15.rar +│   └── subdir6D-file +│   └── test16.txt +├── subdir07-ok +│   ├── test17-file.001 +│   ├── test17-file.002 +│   ├── test17-file.003 +│   ├── test17-file.004 +│   ├── test17-file.005 +│   └── test17-file.006 +├── subdir08-err +│   ├── test18-file.part1.rar +│   ├── test18-file.part2.rar +│   ├── test18-file.part3.rar +│   ├── test19-file.part1.rar +│   ├── test19-file.part3.rar +│   ├── test20-file.r00 +│   ├── test20-file.r01 +│   ├── test20-file.rar +│   ├── test21-file.r01 +│   ├── test21-file.rar +│   ├── test22-file.001 +│   ├── test22-file.002 +│   ├── test22-file.003 +│   ├── test23-file.001 +│   └── test23-file.003 +├── subdir09-err +│   ├── test24-file.part3.rar +│   ├── test24-file.part4.rar +│   └── test24-file.part6.rar +├── subdir10-ok +│   ├── ssdA +│   │   ├── test26-no-rar.txt +│   │   ├── test27-file.part1.rar +│   │   ├── test27-file.part2.rar +│   │   ├── test28-file.rar +│   │   └── test29-no-rar.txt +│   ├── ssdB +│   │   ├── test30-file.rar +│   │   ├── test31-no-rar.txt +│   │   ├── test32-file.part1.rar +│   │   └── test32-file.part2.rar +│   ├── ssdC +│   │   ├── test33-file.part1.rar +│   │   ├── test33-file.part2.rar +│   │   ├── test34-file.part1.rar +│   │   ├── test34-file.part2.rar +│   │   ├── test35-no-rar.txt +│   │   └── test36-no-rar.txt +│   ├── test25.txt +│   └── test37-no-rar.txt +├── subdir11-ok +│   ├── test38-file.part001.r00 +│   ├── test38-file.part001.rar +│   ├── test38-file.part002.part1.rar +│   └── test38-file.part002.part2.rar +├── subdir12-ok +│   └── test39.txt +└── test0-ok.txt 21 directories, 113 files diff --git a/docs/test-data/06-run-unrar.txt b/docs/test-data/06-run-unrar.txt index 5e4678a..903d1b6 100644 --- a/docs/test-data/06-run-unrar.txt +++ b/docs/test-data/06-run-unrar.txt @@ -21,12 +21,15 @@ Misssing part num '4' - guessed file name '/subdir06-err/subdir6B-rar_error/test Extracting file '/subdir06-err/subdir6B-rar_error/test15.rar' (first of 5 parts). Error 3 in extracting from '/home/mj/devel/dalsi-my/auto-unrar/bin/../temp/test-data/in/subdir06-err/subdir6B-rar_error/test15.rar'. Rar archive extractiong error: 3. +Can't remove dir with items '/home/mj/devel/dalsi-my/auto-unrar/bin/../temp/test-data/out/subdir06-err/subdir6A-rar_ok' (item 'test14.txt'). +Can't remove dir with items '/home/mj/devel/dalsi-my/auto-unrar/bin/../temp/test-data/out/subdir06-err/subdir6A-rar_ok' (item 'test14.txt'). Extracting file '/subdir07-ok/test17-file.001' (first of 6 parts). Extracting file '/subdir08-err/test18-file.part1.rar' (first of 3 parts). Misssing part num '2' - guessed file name '/subdir08-err/test19-file.part2.rar'. Extracting file '/subdir08-err/test19-file.part1.rar' (first of 3 parts). Error 3 in extracting from '/home/mj/devel/dalsi-my/auto-unrar/bin/../temp/test-data/in/subdir08-err/test19-file.part1.rar'. Rar archive extractiong error: 3. +Can't remove dir with items '/home/mj/devel/dalsi-my/auto-unrar/bin/../temp/test-data/out/subdir08-err' (item 'test18-file.txt'). Directory '/home/mj/devel/dalsi-my/auto-unrar/bin/../temp/test-data/out/subdir09-err' not open for read. Extracting file '/subdir10-ok/ssdA/test27-file.part1.rar' (first of 2 parts). Extracting file '/subdir10-ok/ssdA/test28-file.rar'. diff --git a/docs/test-data/07-in-tree-after.txt b/docs/test-data/07-in-tree-after.txt index 16b18d0..cbb7232 100644 --- a/docs/test-data/07-in-tree-after.txt +++ b/docs/test-data/07-in-tree-after.txt @@ -1,55 +1,55 @@ # Input tree of 'src_dir' (temp/test-data/in/) after auto-unrar run: temp/test-data/in/ -|-- subdir04-err -| |-- test8.txt -| |-- test9.part1.rar -| |-- test9.part2.rar -| |-- test9.part4.rar -| |-- test9.part5.rar -| `-- test9.part8.rar -|-- subdir05-err -| |-- subdir5A-file -| | `-- test10.txt -| |-- subdir5B-rar_error -| | |-- test11.part1.rar -| | |-- test11.part3.rar -| | `-- test11.part4.rar -| `-- test12.txt -|-- subdir06-err -| |-- subdir6A-rar_ok -| | |-- test13.txt -| | |-- test14.part1.rar -| | |-- test14.part2.rar -| | |-- test14.part3.rar -| | |-- test14.part4.rar -| | `-- test14.part5.rar -| |-- subdir6B-rar_error -| | |-- test15.r00 -| | |-- test15.r01 -| | |-- test15.r03 -| | `-- test15.rar -| `-- subdir6D-file -| `-- test16.txt -|-- subdir08-err -| |-- test18-file.part1.rar -| |-- test18-file.part2.rar -| |-- test18-file.part3.rar -| |-- test19-file.part1.rar -| |-- test19-file.part3.rar -| |-- test20-file.r00 -| |-- test20-file.r01 -| |-- test20-file.rar -| |-- test21-file.r01 -| |-- test21-file.rar -| |-- test22-file.001 -| |-- test22-file.002 -| |-- test22-file.003 -| |-- test23-file.001 -| `-- test23-file.003 -`-- subdir09-err - |-- test24-file.part3.rar - |-- test24-file.part4.rar - `-- test24-file.part6.rar +├── subdir04-err +│   ├── test8.txt +│   ├── test9.part1.rar +│   ├── test9.part2.rar +│   ├── test9.part4.rar +│   ├── test9.part5.rar +│   └── test9.part8.rar +├── subdir05-err +│   ├── subdir5A-file +│   │   └── test10.txt +│   ├── subdir5B-rar_error +│   │   ├── test11.part1.rar +│   │   ├── test11.part3.rar +│   │   └── test11.part4.rar +│   └── test12.txt +├── subdir06-err +│   ├── subdir6A-rar_ok +│   │   ├── test13.txt +│   │   ├── test14.part1.rar +│   │   ├── test14.part2.rar +│   │   ├── test14.part3.rar +│   │   ├── test14.part4.rar +│   │   └── test14.part5.rar +│   ├── subdir6B-rar_error +│   │   ├── test15.r00 +│   │   ├── test15.r01 +│   │   ├── test15.r03 +│   │   └── test15.rar +│   └── subdir6D-file +│   └── test16.txt +├── subdir08-err +│   ├── test18-file.part1.rar +│   ├── test18-file.part2.rar +│   ├── test18-file.part3.rar +│   ├── test19-file.part1.rar +│   ├── test19-file.part3.rar +│   ├── test20-file.r00 +│   ├── test20-file.r01 +│   ├── test20-file.rar +│   ├── test21-file.r01 +│   ├── test21-file.rar +│   ├── test22-file.001 +│   ├── test22-file.002 +│   ├── test22-file.003 +│   ├── test23-file.001 +│   └── test23-file.003 +└── subdir09-err + ├── test24-file.part3.rar + ├── test24-file.part4.rar + └── test24-file.part6.rar 10 directories, 40 files diff --git a/docs/test-data/08-out-tree-after.txt b/docs/test-data/08-out-tree-after.txt index 0090834..6c639ab 100644 --- a/docs/test-data/08-out-tree-after.txt +++ b/docs/test-data/08-out-tree-after.txt @@ -1,58 +1,63 @@ # Input tree of 'src_dir' (temp/test-data/out/) after auto-unrar run: temp/test-data/out/ -|-- subdir01-ok -| |-- test1-file.txt -| |-- test1-file.txt.2 -| |-- test1.txt -| |-- test2-file1.txt -| |-- test2-file2.txt -| |-- test2-file3.txt -| `-- test2.txt -|-- subdir02-ok -| |-- subdir2b -| | |-- test3-dir -| | | `-- test3-file.txt -| | |-- test3.txt -| | |-- test4-dir1 -| | | |-- test4-dir1-file1.txt -| | | `-- test4-dir1-file2.txt -| | |-- test4-dir2 -| | | |-- test4-dir2-file1.txt -| | | |-- test4-dir2-file2.txt -| | | `-- test4-dir2-file3.txt -| | `-- test4.txt -| |-- test5arch.txt -| `-- test5.txt -|-- subdir03-ok -| |-- test6-dir\ -\ spaces -| | `-- test6-file\ -\ spaces.txt -| `-- test7-dir -| `-- test7-file.txt -|-- subdir07-ok -| `-- test17-file.txt -|-- subdir10-ok -| |-- ssdA -| | |-- test26-no-rar.txt -| | |-- test27-file.txt -| | |-- test28-file.txt -| | `-- test29-no-rar.txt -| |-- ssdB -| | |-- test30-file.txt -| | |-- test31-no-rar.txt -| | `-- test32-file.txt -| |-- ssdC -| | |-- test33-file.txt -| | |-- test34-file.txt -| | |-- test35-no-rar.txt -| | `-- test36-no-rar.txt -| |-- test25.txt -| `-- test37-no-rar.txt -|-- subdir11-ok -| |-- test38-file.part001.txt -| `-- test38-file.part002.txt -|-- subdir12-ok -| `-- test39.txt -`-- test0-ok.txt +├── subdir01-ok +│   ├── test1-file.txt +│   ├── test1-file.txt.2 +│   ├── test1.txt +│   ├── test2-file1.txt +│   ├── test2-file2.txt +│   ├── test2-file3.txt +│   └── test2.txt +├── subdir02-ok +│   ├── subdir2b +│   │   ├── test3-dir +│   │   │   └── test3-file.txt +│   │   ├── test3.txt +│   │   ├── test4-dir1 +│   │   │   ├── test4-dir1-file1.txt +│   │   │   └── test4-dir1-file2.txt +│   │   ├── test4-dir2 +│   │   │   ├── test4-dir2-file1.txt +│   │   │   ├── test4-dir2-file2.txt +│   │   │   └── test4-dir2-file3.txt +│   │   └── test4.txt +│   ├── test5arch.txt +│   └── test5.txt +├── subdir03-ok +│   ├── test6-dir\ -\ spaces +│   │   └── test6-file\ -\ spaces.txt +│   └── test7-dir +│   └── test7-file.txt +├── subdir06-err +│   └── subdir6A-rar_ok +│   └── test14.txt +├── subdir07-ok +│   └── test17-file.txt +├── subdir08-err +│   └── test18-file.txt +├── subdir10-ok +│   ├── ssdA +│   │   ├── test26-no-rar.txt +│   │   ├── test27-file.txt +│   │   ├── test28-file.txt +│   │   └── test29-no-rar.txt +│   ├── ssdB +│   │   ├── test30-file.txt +│   │   ├── test31-no-rar.txt +│   │   └── test32-file.txt +│   ├── ssdC +│   │   ├── test33-file.txt +│   │   ├── test34-file.txt +│   │   ├── test35-no-rar.txt +│   │   └── test36-no-rar.txt +│   ├── test25.txt +│   └── test37-no-rar.txt +├── subdir11-ok +│   ├── test38-file.part001.txt +│   └── test38-file.part002.txt +├── subdir12-ok +│   └── test39.txt +└── test0-ok.txt -16 directories, 37 files +19 directories, 39 files diff --git a/docs/test-data/09-state-after.txt b/docs/test-data/09-state-after.txt index 2c579db..68c0594 100644 --- a/docs/test-data/09-state-after.txt +++ b/docs/test-data/09-state-after.txt @@ -2,14 +2,14 @@ { 'done' => { - '/subdir01-ok' => 1370725947, - '/subdir02-ok' => 1370725947, - '/subdir03-ok' => 1370725947, - '/subdir07-ok' => 1370725948, - '/subdir10-ok' => 1370725948, - '/subdir11-ok' => 1370725948, - '/subdir12-ok' => 1370725948, - '/test0-ok.txt' => 1370725948 + '/subdir01-ok' => 1420734856, + '/subdir02-ok' => 1420734856, + '/subdir03-ok' => 1420734856, + '/subdir07-ok' => 1420734856, + '/subdir10-ok' => 1420734856, + '/subdir11-ok' => 1420734856, + '/subdir12-ok' => 1420734856, + '/test0-ok.txt' => 1420734856 }, 'info' => { '/subdir04-err' => [ @@ -57,7 +57,7 @@ 'err_code' => -3, 'type' => 'rar' }, - 'time' => 1370725948 + 'time' => 1420734856 } ], '/subdir05-err' => [ @@ -110,7 +110,7 @@ 'err_code' => -3, 'type' => 'rar' }, - 'time' => 1370725948 + 'time' => 1420734856 } ], '/subdir06-err' => [ @@ -198,7 +198,7 @@ 'err_code' => -3, 'type' => 'rar' }, - 'time' => 1370725948 + 'time' => 1420734856 } ], '/subdir08-err' => [ @@ -291,7 +291,7 @@ 'err_code' => -3, 'type' => 'rar' }, - 'time' => 1370725948 + 'time' => 1420734856 } ], '/subdir09-err' => [ @@ -324,7 +324,7 @@ 'err_code' => -3, 'type' => 'rar' }, - 'time' => 1370725948 + 'time' => 1420734856 } ] } diff --git a/docs/test-data/11-in-tree-diff.txt b/docs/test-data/11-in-tree-diff.txt new file mode 100644 index 0000000..7bb5804 --- /dev/null +++ b/docs/test-data/11-in-tree-diff.txt @@ -0,0 +1,139 @@ +# Input tree of 'src_dir' (temp/test-data/in/) before auto-un | # Input tree of 'src_dir' (temp/test-data/in/) after auto-unr + +temp/test-data/in/ temp/test-data/in/ +├── subdir01-ok < +│   ├── test1-file.txt < +│   ├── test1.rar < +│   ├── test1.txt < +│   ├── test2.rar < +│   └── test2.txt < +├── subdir02-ok < +│   ├── subdir2b < +│   │   ├── test3.rar < +│   │   ├── test3.txt < +│   │   ├── test4.rar < +│   │   └── test4.txt < +│   ├── test5arch.part1.rar < +│   ├── test5arch.part2.rar < +│   ├── test5arch.part3.rar < +│   ├── test5arch.part4.rar < +│   ├── test5arch.part5.rar < +│   └── test5.txt < +├── subdir03-ok < +│   ├── test6-dir\ -\ spaces.rar < +│   ├── test7-dir.r00 < +│   ├── test7-dir.r01 < +│   ├── test7-dir.r02 < +│   ├── test7-dir.r03 < +│   ├── test7-dir.r04 < +│   ├── test7-dir.r05 < +│   ├── test7-dir.r06 < +│   ├── test7-dir.r07 < +│   ├── test7-dir.r08 < +│   ├── test7-dir.r09 < +│   ├── test7-dir.r10 < +│   ├── test7-dir.r11 < +│   ├── test7-dir.r12 < +│   ├── test7-dir.r13 < +│   ├── test7-dir.r14 < +│   ├── test7-dir.r15 < +│   ├── test7-dir.r16 < +│   ├── test7-dir.r17 < +│   ├── test7-dir.r18 < +│   ├── test7-dir.r19 < +│   ├── test7-dir.r20 < +│   ├── test7-dir.r21 < +│   ├── test7-dir.r22 < +│   ├── test7-dir.r23 < +│   ├── test7-dir.r24 < +│   ├── test7-dir.r25 < +│   ├── test7-dir.r26 < +│   └── test7-dir.rar < +├── subdir04-err ├── subdir04-err +│   ├── test8.txt │   ├── test8.txt +│   ├── test9.part1.rar │   ├── test9.part1.rar +│   ├── test9.part2.rar │   ├── test9.part2.rar +│   ├── test9.part4.rar │   ├── test9.part4.rar +│   ├── test9.part5.rar │   ├── test9.part5.rar +│   └── test9.part8.rar │   └── test9.part8.rar +├── subdir05-err ├── subdir05-err +│   ├── subdir5A-file │   ├── subdir5A-file +│   │   └── test10.txt │   │   └── test10.txt +│   ├── subdir5B-rar_error │   ├── subdir5B-rar_error +│   │   ├── test11.part1.rar │   │   ├── test11.part1.rar +│   │   ├── test11.part3.rar │   │   ├── test11.part3.rar +│   │   └── test11.part4.rar │   │   └── test11.part4.rar +│   └── test12.txt │   └── test12.txt +├── subdir06-err ├── subdir06-err +│   ├── subdir6A-rar_ok │   ├── subdir6A-rar_ok +│   │   ├── test13.txt │   │   ├── test13.txt +│   │   ├── test14.part1.rar │   │   ├── test14.part1.rar +│   │   ├── test14.part2.rar │   │   ├── test14.part2.rar +│   │   ├── test14.part3.rar │   │   ├── test14.part3.rar +│   │   ├── test14.part4.rar │   │   ├── test14.part4.rar +│   │   └── test14.part5.rar │   │   └── test14.part5.rar +│   ├── subdir6B-rar_error │   ├── subdir6B-rar_error +│   │   ├── test15.r00 │   │   ├── test15.r00 +│   │   ├── test15.r01 │   │   ├── test15.r01 +│   │   ├── test15.r03 │   │   ├── test15.r03 +│   │   └── test15.rar │   │   └── test15.rar +│   └── subdir6D-file │   └── subdir6D-file +│   └── test16.txt │   └── test16.txt +├── subdir07-ok < +│   ├── test17-file.001 < +│   ├── test17-file.002 < +│   ├── test17-file.003 < +│   ├── test17-file.004 < +│   ├── test17-file.005 < +│   └── test17-file.006 < +├── subdir08-err ├── subdir08-err +│   ├── test18-file.part1.rar │   ├── test18-file.part1.rar +│   ├── test18-file.part2.rar │   ├── test18-file.part2.rar +│   ├── test18-file.part3.rar │   ├── test18-file.part3.rar +│   ├── test19-file.part1.rar │   ├── test19-file.part1.rar +│   ├── test19-file.part3.rar │   ├── test19-file.part3.rar +│   ├── test20-file.r00 │   ├── test20-file.r00 +│   ├── test20-file.r01 │   ├── test20-file.r01 +│   ├── test20-file.rar │   ├── test20-file.rar +│   ├── test21-file.r01 │   ├── test21-file.r01 +│   ├── test21-file.rar │   ├── test21-file.rar +│   ├── test22-file.001 │   ├── test22-file.001 +│   ├── test22-file.002 │   ├── test22-file.002 +│   ├── test22-file.003 │   ├── test22-file.003 +│   ├── test23-file.001 │   ├── test23-file.001 +│   └── test23-file.003 │   └── test23-file.003 +├── subdir09-err | └── subdir09-err +│   ├── test24-file.part3.rar | ├── test24-file.part3.rar +│   ├── test24-file.part4.rar | ├── test24-file.part4.rar +│   └── test24-file.part6.rar | └── test24-file.part6.rar +├── subdir10-ok < +│   ├── ssdA < +│   │   ├── test26-no-rar.txt < +│   │   ├── test27-file.part1.rar < +│   │   ├── test27-file.part2.rar < +│   │   ├── test28-file.rar < +│   │   └── test29-no-rar.txt < +│   ├── ssdB < +│   │   ├── test30-file.rar < +│   │   ├── test31-no-rar.txt < +│   │   ├── test32-file.part1.rar < +│   │   └── test32-file.part2.rar < +│   ├── ssdC < +│   │   ├── test33-file.part1.rar < +│   │   ├── test33-file.part2.rar < +│   │   ├── test34-file.part1.rar < +│   │   ├── test34-file.part2.rar < +│   │   ├── test35-no-rar.txt < +│   │   └── test36-no-rar.txt < +│   ├── test25.txt < +│   └── test37-no-rar.txt < +├── subdir11-ok < +│   ├── test38-file.part001.r00 < +│   ├── test38-file.part001.rar < +│   ├── test38-file.part002.part1.rar < +│   └── test38-file.part002.part2.rar < +├── subdir12-ok < +│   └── test39.txt < +└── test0-ok.txt < + +21 directories, 113 files | 10 directories, 40 files diff --git a/docs/test-data/12-out-tree-diff.txt b/docs/test-data/12-out-tree-diff.txt new file mode 100644 index 0000000..0aa5c4a --- /dev/null +++ b/docs/test-data/12-out-tree-diff.txt @@ -0,0 +1,63 @@ +# Input tree of 'src_dir' (temp/test-data/out/) before auto-u | # Input tree of 'src_dir' (temp/test-data/out/) after auto-un + +temp/test-data/out/ temp/test-data/out/ + > ├── subdir01-ok + > │   ├── test1-file.txt + > │   ├── test1-file.txt.2 + > │   ├── test1.txt + > │   ├── test2-file1.txt + > │   ├── test2-file2.txt + > │   ├── test2-file3.txt + > │   └── test2.txt + > ├── subdir02-ok + > │   ├── subdir2b + > │   │   ├── test3-dir + > │   │   │   └── test3-file.txt + > │   │   ├── test3.txt + > │   │   ├── test4-dir1 + > │   │   │   ├── test4-dir1-file1.txt + > │   │   │   └── test4-dir1-file2.txt + > │   │   ├── test4-dir2 + > │   │   │   ├── test4-dir2-file1.txt + > │   │   │   ├── test4-dir2-file2.txt + > │   │   │   └── test4-dir2-file3.txt + > │   │   └── test4.txt + > │   ├── test5arch.txt + > │   └── test5.txt + > ├── subdir03-ok + > │   ├── test6-dir\ -\ spaces + > │   │   └── test6-file\ -\ spaces.txt + > │   └── test7-dir + > │   └── test7-file.txt + > ├── subdir06-err + > │   └── subdir6A-rar_ok + > │   └── test14.txt + > ├── subdir07-ok + > │   └── test17-file.txt + > ├── subdir08-err + > │   └── test18-file.txt + > ├── subdir10-ok + > │   ├── ssdA + > │   │   ├── test26-no-rar.txt + > │   │   ├── test27-file.txt + > │   │   ├── test28-file.txt + > │   │   └── test29-no-rar.txt + > │   ├── ssdB + > │   │   ├── test30-file.txt + > │   │   ├── test31-no-rar.txt + > │   │   └── test32-file.txt + > │   ├── ssdC + > │   │   ├── test33-file.txt + > │   │   ├── test34-file.txt + > │   │   ├── test35-no-rar.txt + > │   │   └── test36-no-rar.txt + > │   ├── test25.txt + > │   └── test37-no-rar.txt + > ├── subdir11-ok + > │   ├── test38-file.part001.txt + > │   └── test38-file.part002.txt + > ├── subdir12-ok + > │   └── test39.txt + > └── test0-ok.txt + +0 directories, 0 files | 19 directories, 39 files diff --git a/tests/test-out.sh b/tests/test-out.sh index 5c9691f..781bfe5 100755 --- a/tests/test-out.sh +++ b/tests/test-out.sh @@ -27,7 +27,7 @@ echo "# Input tree of 'src_dir' (temp/test-data/in/) before auto-unrar run:" > $ echo "" >> $OUTD/02-in-tree-before.txt tree temp/test-data/in/ >> $OUTD/02-in-tree-before.txt -echo "# Input tree of 'src_dir' (temp/test-data/out/) before auto-unrar run:" > $OUTD/03-out-tree-before.txt +echo "# Output tree of 'src_dir' (temp/test-data/out/) before auto-unrar run:" > $OUTD/03-out-tree-before.txt echo "" >> $OUTD/03-out-tree-before.txt tree temp/test-data/out/ >> $OUTD/03-out-tree-before.txt @@ -49,7 +49,7 @@ echo "# Input tree of 'src_dir' (temp/test-data/in/) after auto-unrar run:" > $O echo "" >> $OUTD/07-in-tree-after.txt tree temp/test-data/in/ >> $OUTD/07-in-tree-after.txt -echo "# Input tree of 'src_dir' (temp/test-data/out/) after auto-unrar run:" > $OUTD/08-out-tree-after.txt +echo "# Output tree of 'src_dir' (temp/test-data/out/) after auto-unrar run:" > $OUTD/08-out-tree-after.txt echo "" >> $OUTD/08-out-tree-after.txt tree temp/test-data/out/ >> $OUTD/08-out-tree-after.txt @@ -60,3 +60,7 @@ cat temp/test-data/state.pl >> $OUTD/09-state-after.txt echo "# Rsync exclude file (temp/test-data/rsync-exclude-list.txt) after auto-unrar run:" > $OUTD/10-exclude-list-after.txt echo "" >> $OUTD/10-exclude-list-after.txt cat temp/test-data/rsync-exclude-list.txt >> $OUTD/10-exclude-list-after.txt + +# diffs +diff --side-by-side $OUTD/02-in-tree-before.txt $OUTD/07-in-tree-after.txt > $OUTD/11-in-tree-diff.txt || true +diff --side-by-side $OUTD/03-out-tree-before.txt $OUTD/08-out-tree-after.txt > $OUTD/12-out-tree-diff.txt || true