Merge branch 'master' of github.com:weewx/weewx

.gitignore

@@ -1,4 +1,5 @@
 *~
+.idea
 .project
 .pydevproject
 .settings

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]]

bin/weewx/test/expected/index.html

@@ -188,7 +188,7 @@
       <td>PASS</td>
     </tr> 
     <tr>
-      <td>Test for a bad attribute on a tag: $current.foobar</td>
+      <td>Test for a bad observation type on a $current tag: $current.foobar</td>
       <td>?'foobar'?</td>
     </tr>
   </table>
@@ -372,6 +372,10 @@
       <td>Test tag "has_data" with existent type that has data</td>
       <td>PASS</td>
     </tr>
+      <tr>
+      <td>Test for a bad observation type on a $day tag: $day.foobar.min</td>
+      <td>$day.foobar.min</td>
+    </tr>
   </table>
 
   <hr/>

bin/weewx/test/expected/metric/index.html

@@ -188,7 +188,7 @@
       <td>PASS</td>
     </tr> 
     <tr>
-      <td>Test for a bad attribute on a tag: $current.foobar</td>
+      <td>Test for a bad observation type on a $current tag: $current.foobar</td>
       <td>?'foobar'?</td>
     </tr>
   </table>
@@ -372,6 +372,10 @@
       <td>Test tag "has_data" with existent type that has data</td>
       <td>PASS</td>
     </tr>
+      <tr>
+      <td>Test for a bad observation type on a $day tag: $day.foobar.min</td>
+      <td>$day.foobar.min</td>
+    </tr>
   </table>
 
   <hr/>

bin/weewx/test/test_skins/StandardTest/index.html.tmpl

@@ -214,7 +214,7 @@
     #end if
     </tr> 
     <tr>
-      <td>Test for a bad attribute on a tag: \$current.foobar</td>
+      <td>Test for a bad observation type on a \$current tag: \$current.foobar</td>
       <td>$current.foobar</td>
     </tr>
   </table>
@@ -401,6 +401,10 @@
       <td>FAIL</td>
       #end if
     </tr>
+      <tr>
+      <td>Test for a bad observation type on a \$day tag: \$day.foobar.min</td>
+      <td>$day.foobar.min</td>
+    </tr>
   </table>
 
   <hr/>