From e2c1eeca9ce8c53a3f96db197826dedb416148b7 Mon Sep 17 00:00:00 2001 From: "tkeffer@gmail.com" Date: Fri, 24 Jul 2015 13:08:47 -0700 Subject: [PATCH 1/3] Added .idea to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1e2b25c3..040d8cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ +.idea .project .pydevproject .settings From ac8f8d909b9d00e7d795296c961d7765cda7eee1 Mon Sep 17 00:00:00 2001 From: "tkeffer@gmail.com" Date: Fri, 24 Jul 2015 13:09:44 -0700 Subject: [PATCH 2/3] Corrected expected result for SQLITE_ROOT to now use WEEWX_ROOT interpolation --- bin/weecfg/test/expected/weewx_user_expected.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/weecfg/test/expected/weewx_user_expected.conf b/bin/weecfg/test/expected/weewx_user_expected.conf index 5d74dec3..0ed7ef6a 100644 --- a/bin/weecfg/test/expected/weewx_user_expected.conf +++ b/bin/weecfg/test/expected/weewx_user_expected.conf @@ -401,7 +401,7 @@ version = 3.2.0a2 [[SQLite]] driver = weedb.sqlite # Directory in which the database files are located - SQLITE_ROOT = /home/weewx/archive + SQLITE_ROOT = %(WEEWX_ROOT)s/archive # Defaults for MySQL databases [[MySQL]] From 61664530669a4c566579e62fb8941b30f8ec585b Mon Sep 17 00:00:00 2001 From: "tkeffer@gmail.com" Date: Fri, 24 Jul 2015 14:02:51 -0700 Subject: [PATCH 3/3] Added additional tests for bad observation types. --- bin/weewx/test/expected/index.html | 6 +++++- bin/weewx/test/expected/metric/index.html | 6 +++++- bin/weewx/test/test_skins/StandardTest/index.html.tmpl | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/bin/weewx/test/expected/index.html b/bin/weewx/test/expected/index.html index f507b300..b3958021 100644 --- a/bin/weewx/test/expected/index.html +++ b/bin/weewx/test/expected/index.html @@ -188,7 +188,7 @@ PASS - Test for a bad attribute on a tag: $current.foobar + Test for a bad observation type on a $current tag: $current.foobar ?'foobar'? @@ -372,6 +372,10 @@ Test tag "has_data" with existent type that has data PASS + + Test for a bad observation type on a $day tag: $day.foobar.min + $day.foobar.min +
diff --git a/bin/weewx/test/expected/metric/index.html b/bin/weewx/test/expected/metric/index.html index dcfc3bd2..da1be3bf 100644 --- a/bin/weewx/test/expected/metric/index.html +++ b/bin/weewx/test/expected/metric/index.html @@ -188,7 +188,7 @@ PASS - Test for a bad attribute on a tag: $current.foobar + Test for a bad observation type on a $current tag: $current.foobar ?'foobar'? @@ -372,6 +372,10 @@ Test tag "has_data" with existent type that has data PASS + + Test for a bad observation type on a $day tag: $day.foobar.min + $day.foobar.min +
diff --git a/bin/weewx/test/test_skins/StandardTest/index.html.tmpl b/bin/weewx/test/test_skins/StandardTest/index.html.tmpl index 98ac40fe..9d1fa82e 100644 --- a/bin/weewx/test/test_skins/StandardTest/index.html.tmpl +++ b/bin/weewx/test/test_skins/StandardTest/index.html.tmpl @@ -214,7 +214,7 @@ #end if - Test for a bad attribute on a tag: \$current.foobar + Test for a bad observation type on a \$current tag: \$current.foobar $current.foobar @@ -401,6 +401,10 @@ FAIL #end if + + Test for a bad observation type on a \$day tag: \$day.foobar.min + $day.foobar.min +