From a734daa8462ab3734dec3a319e4fbdb9b3d4523b Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Fri, 21 Aug 2015 15:07:01 -0400 Subject: [PATCH] nitiwiki: update results and report test error Signed-off-by: Jean Privat --- .../nitiwiki/tests/res/wiki1_nitiwiki_render.res | 4 +++- .../nitiwiki/tests/res/wiki1_nitiwiki_status.res | 3 +-- .../nitiwiki/tests/res/wiki2_nitiwiki_render.res | 20 ++++++++++++++------ .../nitiwiki/tests/res/wiki2_nitiwiki_status.res | 5 ++--- .../nitiwiki/tests/res/wiki3_nitiwiki_render.res | 6 +++++- .../nitiwiki/tests/res/wiki3_nitiwiki_status.res | 1 - contrib/nitiwiki/tests/tests.sh | 3 +++ 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/contrib/nitiwiki/tests/res/wiki1_nitiwiki_render.res b/contrib/nitiwiki/tests/res/wiki1_nitiwiki_render.res index adf25a7..3486602 100644 --- a/contrib/nitiwiki/tests/res/wiki1_nitiwiki_render.res +++ b/contrib/nitiwiki/tests/res/wiki1_nitiwiki_render.res @@ -1 +1,3 @@ -Render section out +Render section pages -> out +Render article index -> wiki1/out/index.html +Render article sitemap -> wiki1/out/sitemap.html diff --git a/contrib/nitiwiki/tests/res/wiki1_nitiwiki_status.res b/contrib/nitiwiki/tests/res/wiki1_nitiwiki_status.res index 43bf159..6857efd 100644 --- a/contrib/nitiwiki/tests/res/wiki1_nitiwiki_status.res +++ b/contrib/nitiwiki/tests/res/wiki1_nitiwiki_status.res @@ -1,10 +1,9 @@ nitiWiki name: wiki1 config: wiki1/config.ini -url: http://localhost/ There is modified files: - + pages + * pages + pages/index.md Use nitiwiki --render to render modified files diff --git a/contrib/nitiwiki/tests/res/wiki2_nitiwiki_render.res b/contrib/nitiwiki/tests/res/wiki2_nitiwiki_render.res index dfc19e5..1bf4497 100644 --- a/contrib/nitiwiki/tests/res/wiki2_nitiwiki_render.res +++ b/contrib/nitiwiki/tests/res/wiki2_nitiwiki_render.res @@ -1,5 +1,5 @@ -Custom config for section sec2 -Render section out +Render section pages -> out +Render article contact -> wiki2/out/contact.html Warning: unknown wikilink `not found` (in pages/index.md) Warning: unknown wikilink `Not Found` (in pages/index.md) Warning: unknown wikilink `/not/found` (in pages/index.md) @@ -7,8 +7,11 @@ Warning: unknown wikilink `not/found` (in pages/index.md) Warning: unknown wikilink `not found` (in pages/index.md) Warning: unknown wikilink `not found` (in pages/index.md) Warning: unknown wikilink `not found` (in pages/index.md) -Render section out/sec1 -Render section out/sec2 +Render article index -> wiki2/out/index.html +Render article other_page -> wiki2/out/other_page.html +Render section sec1 -> out/sec1 +Render article index -> wiki2/out/sec1/index.html +Render section sec2 -> out/sec2 Warning: unknown wikilink `not found` (in pages/sec2/index.md) Warning: unknown wikilink `Not Found` (in pages/sec2/index.md) Warning: unknown wikilink `/not/found` (in pages/sec2/index.md) @@ -16,5 +19,10 @@ Warning: unknown wikilink `not/found` (in pages/sec2/index.md) Warning: unknown wikilink `not found` (in pages/sec2/index.md) Warning: unknown wikilink `not found` (in pages/sec2/index.md) Warning: unknown wikilink `not found` (in pages/sec2/index.md) -Render section out/sec2/sub-sec21 -Render section out/sec2/sub-sec22 +Render article index -> wiki2/out/sec2/index.html +Render section sub-sec21 -> out/sec2/sub-sec21 +Render article index -> wiki2/out/sec2/sub-sec21/index.html +Render section sub-sec22 -> out/sec2/sub-sec22 +Render article index -> wiki2/out/sec2/sub-sec22/index.html +Render article other -> wiki2/out/sec2/sub-sec22/other.html +Render article sitemap -> wiki2/out/sitemap.html diff --git a/contrib/nitiwiki/tests/res/wiki2_nitiwiki_status.res b/contrib/nitiwiki/tests/res/wiki2_nitiwiki_status.res index f03f5d4..e161e3e 100644 --- a/contrib/nitiwiki/tests/res/wiki2_nitiwiki_status.res +++ b/contrib/nitiwiki/tests/res/wiki2_nitiwiki_status.res @@ -1,16 +1,15 @@ nitiWiki name: wiki2 config: wiki2/config.ini -url: http://localhost/ There is modified files: - + pages + * pages + pages/contact.md + pages/index.md + pages/other_page.md + pages/sec1 + pages/sec1/index.md - + pages/sec2 + * pages/sec2 + pages/sec2/index.md + pages/sec2/sub-sec21 + pages/sec2/sub-sec21/index.md diff --git a/contrib/nitiwiki/tests/res/wiki3_nitiwiki_render.res b/contrib/nitiwiki/tests/res/wiki3_nitiwiki_render.res index adf25a7..2199343 100644 --- a/contrib/nitiwiki/tests/res/wiki3_nitiwiki_render.res +++ b/contrib/nitiwiki/tests/res/wiki3_nitiwiki_render.res @@ -1 +1,5 @@ -Render section out +Render section pages -> out +Render article contact -> wiki3/out/contact.html +Render article index -> wiki3/out/index.html +Render article other_page -> wiki3/out/other_page.html +Render article sitemap -> wiki3/out/sitemap.html diff --git a/contrib/nitiwiki/tests/res/wiki3_nitiwiki_status.res b/contrib/nitiwiki/tests/res/wiki3_nitiwiki_status.res index 04cbacf..5ac36d5 100644 --- a/contrib/nitiwiki/tests/res/wiki3_nitiwiki_status.res +++ b/contrib/nitiwiki/tests/res/wiki3_nitiwiki_status.res @@ -1,7 +1,6 @@ nitiWiki name: wiki3 config: wiki3/config.ini -url: http://localhost/ There is modified files: + pages diff --git a/contrib/nitiwiki/tests/tests.sh b/contrib/nitiwiki/tests/tests.sh index 2acbe94..73474af 100755 --- a/contrib/nitiwiki/tests/tests.sh +++ b/contrib/nitiwiki/tests/tests.sh @@ -90,3 +90,6 @@ for file in `ls *.args`; do done echo "" echo "==> success $ok/$all ($ko tests failed, $sk skipped)" + +# return result +test "$ok" == "$all" -- 1.7.9.5