diff --git a/bin/weecfg/test/expected/weewx25_expected.conf b/bin/weecfg/tests/expected/weewx25_expected.conf similarity index 100% rename from bin/weecfg/test/expected/weewx25_expected.conf rename to bin/weecfg/tests/expected/weewx25_expected.conf diff --git a/bin/weecfg/test/expected/weewx26_expected.conf b/bin/weecfg/tests/expected/weewx26_expected.conf similarity index 100% rename from bin/weecfg/test/expected/weewx26_expected.conf rename to bin/weecfg/tests/expected/weewx26_expected.conf diff --git a/bin/weecfg/test/expected/weewx30_expected.conf b/bin/weecfg/tests/expected/weewx30_expected.conf similarity index 100% rename from bin/weecfg/test/expected/weewx30_expected.conf rename to bin/weecfg/tests/expected/weewx30_expected.conf diff --git a/bin/weecfg/test/expected/weewx32_expected.conf b/bin/weecfg/tests/expected/weewx32_expected.conf similarity index 100% rename from bin/weecfg/test/expected/weewx32_expected.conf rename to bin/weecfg/tests/expected/weewx32_expected.conf diff --git a/bin/weecfg/test/expected/weewx36_expected.conf b/bin/weecfg/tests/expected/weewx36_expected.conf similarity index 100% rename from bin/weecfg/test/expected/weewx36_expected.conf rename to bin/weecfg/tests/expected/weewx36_expected.conf diff --git a/bin/weecfg/test/expected/weewx39_expected.conf b/bin/weecfg/tests/expected/weewx39_expected.conf similarity index 100% rename from bin/weecfg/test/expected/weewx39_expected.conf rename to bin/weecfg/tests/expected/weewx39_expected.conf diff --git a/bin/weecfg/test/expected/weewx39_user_expected.conf b/bin/weecfg/tests/expected/weewx39_user_expected.conf similarity index 100% rename from bin/weecfg/test/expected/weewx39_user_expected.conf rename to bin/weecfg/tests/expected/weewx39_user_expected.conf diff --git a/bin/weecfg/test/pmon.tar b/bin/weecfg/tests/pmon.tar similarity index 100% rename from bin/weecfg/test/pmon.tar rename to bin/weecfg/tests/pmon.tar diff --git a/bin/weecfg/test/pmon.tgz b/bin/weecfg/tests/pmon.tgz similarity index 100% rename from bin/weecfg/test/pmon.tgz rename to bin/weecfg/tests/pmon.tgz diff --git a/bin/weecfg/test/pmon.zip b/bin/weecfg/tests/pmon.zip similarity index 100% rename from bin/weecfg/test/pmon.zip rename to bin/weecfg/tests/pmon.zip diff --git a/bin/weecfg/test/test_config.py b/bin/weecfg/tests/test_config.py similarity index 100% rename from bin/weecfg/test/test_config.py rename to bin/weecfg/tests/test_config.py diff --git a/bin/weecfg/test/weewx20.conf b/bin/weecfg/tests/weewx20.conf similarity index 100% rename from bin/weecfg/test/weewx20.conf rename to bin/weecfg/tests/weewx20.conf diff --git a/bin/weecfg/test/weewx20_user.conf b/bin/weecfg/tests/weewx20_user.conf similarity index 100% rename from bin/weecfg/test/weewx20_user.conf rename to bin/weecfg/tests/weewx20_user.conf diff --git a/bin/weecfg/test/weewx25.conf b/bin/weecfg/tests/weewx25.conf similarity index 100% rename from bin/weecfg/test/weewx25.conf rename to bin/weecfg/tests/weewx25.conf diff --git a/bin/weecfg/test/weewx27.conf b/bin/weecfg/tests/weewx27.conf similarity index 100% rename from bin/weecfg/test/weewx27.conf rename to bin/weecfg/tests/weewx27.conf diff --git a/bin/weecfg/test/weewx30.conf b/bin/weecfg/tests/weewx30.conf similarity index 100% rename from bin/weecfg/test/weewx30.conf rename to bin/weecfg/tests/weewx30.conf diff --git a/bin/weecfg/test/weewx32.conf b/bin/weecfg/tests/weewx32.conf similarity index 100% rename from bin/weecfg/test/weewx32.conf rename to bin/weecfg/tests/weewx32.conf diff --git a/bin/weecfg/test/weewx38.conf b/bin/weecfg/tests/weewx38.conf similarity index 100% rename from bin/weecfg/test/weewx38.conf rename to bin/weecfg/tests/weewx38.conf diff --git a/bin/weecfg/test/weewx38_user.conf b/bin/weecfg/tests/weewx38_user.conf similarity index 100% rename from bin/weecfg/test/weewx38_user.conf rename to bin/weecfg/tests/weewx38_user.conf diff --git a/bin/weedb/test/check_mysql.py b/bin/weedb/tests/check_mysql.py similarity index 100% rename from bin/weedb/test/check_mysql.py rename to bin/weedb/tests/check_mysql.py diff --git a/bin/weedb/test/check_sqlite.py b/bin/weedb/tests/check_sqlite.py similarity index 100% rename from bin/weedb/test/check_sqlite.py rename to bin/weedb/tests/check_sqlite.py diff --git a/bin/weedb/test/setup_mysql b/bin/weedb/tests/setup_mysql similarity index 100% rename from bin/weedb/test/setup_mysql rename to bin/weedb/tests/setup_mysql diff --git a/bin/weedb/test/test_errors.py b/bin/weedb/tests/test_errors.py similarity index 100% rename from bin/weedb/test/test_errors.py rename to bin/weedb/tests/test_errors.py diff --git a/bin/weedb/test/test_weedb.py b/bin/weedb/tests/test_weedb.py similarity index 100% rename from bin/weedb/test/test_weedb.py rename to bin/weedb/tests/test_weedb.py diff --git a/bin/weeplot/test/test_utilities.py b/bin/weeplot/tests/test_utilities.py similarity index 100% rename from bin/weeplot/test/test_utilities.py rename to bin/weeplot/tests/test_utilities.py diff --git a/bin/weeutil/test/test_sun.py b/bin/weeutil/tests/test_sun.py similarity index 100% rename from bin/weeutil/test/test_sun.py rename to bin/weeutil/tests/test_sun.py diff --git a/bin/weeutil/test/test_weeutil.py b/bin/weeutil/tests/test_weeutil.py similarity index 100% rename from bin/weeutil/test/test_weeutil.py rename to bin/weeutil/tests/test_weeutil.py diff --git a/bin/weewx/test/expected/StandardTest/byhour.txt b/bin/weewx/tests/expected/StandardTest/byhour.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/byhour.txt rename to bin/weewx/tests/expected/StandardTest/byhour.txt diff --git a/bin/weewx/test/expected/StandardTest/bymonth.txt b/bin/weewx/tests/expected/StandardTest/bymonth.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/bymonth.txt rename to bin/weewx/tests/expected/StandardTest/bymonth.txt diff --git a/bin/weewx/test/expected/StandardTest/byrecord.txt b/bin/weewx/tests/expected/StandardTest/byrecord.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/byrecord.txt rename to bin/weewx/tests/expected/StandardTest/byrecord.txt diff --git a/bin/weewx/test/expected/StandardTest/byspan.txt b/bin/weewx/tests/expected/StandardTest/byspan.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/byspan.txt rename to bin/weewx/tests/expected/StandardTest/byspan.txt diff --git a/bin/weewx/test/expected/StandardTest/byyear.txt b/bin/weewx/tests/expected/StandardTest/byyear.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/byyear.txt rename to bin/weewx/tests/expected/StandardTest/byyear.txt diff --git a/bin/weewx/test/expected/StandardTest/index.html b/bin/weewx/tests/expected/StandardTest/index.html similarity index 100% rename from bin/weewx/test/expected/StandardTest/index.html rename to bin/weewx/tests/expected/StandardTest/index.html diff --git a/bin/weewx/test/expected/StandardTest/metric/byhour.txt b/bin/weewx/tests/expected/StandardTest/metric/byhour.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/metric/byhour.txt rename to bin/weewx/tests/expected/StandardTest/metric/byhour.txt diff --git a/bin/weewx/test/expected/StandardTest/metric/bymonth.txt b/bin/weewx/tests/expected/StandardTest/metric/bymonth.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/metric/bymonth.txt rename to bin/weewx/tests/expected/StandardTest/metric/bymonth.txt diff --git a/bin/weewx/test/expected/StandardTest/metric/byrecord.txt b/bin/weewx/tests/expected/StandardTest/metric/byrecord.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/metric/byrecord.txt rename to bin/weewx/tests/expected/StandardTest/metric/byrecord.txt diff --git a/bin/weewx/test/expected/StandardTest/metric/byspan.txt b/bin/weewx/tests/expected/StandardTest/metric/byspan.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/metric/byspan.txt rename to bin/weewx/tests/expected/StandardTest/metric/byspan.txt diff --git a/bin/weewx/test/expected/StandardTest/metric/byyear.txt b/bin/weewx/tests/expected/StandardTest/metric/byyear.txt similarity index 100% rename from bin/weewx/test/expected/StandardTest/metric/byyear.txt rename to bin/weewx/tests/expected/StandardTest/metric/byyear.txt diff --git a/bin/weewx/test/expected/StandardTest/metric/index.html b/bin/weewx/tests/expected/StandardTest/metric/index.html similarity index 100% rename from bin/weewx/test/expected/StandardTest/metric/index.html rename to bin/weewx/tests/expected/StandardTest/metric/index.html diff --git a/bin/weewx/test/gen_fake_data.py b/bin/weewx/tests/gen_fake_data.py similarity index 100% rename from bin/weewx/test/gen_fake_data.py rename to bin/weewx/tests/gen_fake_data.py diff --git a/bin/weewx/test/simgen.conf b/bin/weewx/tests/simgen.conf similarity index 100% rename from bin/weewx/test/simgen.conf rename to bin/weewx/tests/simgen.conf diff --git a/bin/weewx/test/test_accum.py b/bin/weewx/tests/test_accum.py similarity index 100% rename from bin/weewx/test/test_accum.py rename to bin/weewx/tests/test_accum.py diff --git a/bin/weewx/test/test_almanac.py b/bin/weewx/tests/test_almanac.py similarity index 100% rename from bin/weewx/test/test_almanac.py rename to bin/weewx/tests/test_almanac.py diff --git a/bin/weewx/test/test_daily.py b/bin/weewx/tests/test_daily.py similarity index 100% rename from bin/weewx/test/test_daily.py rename to bin/weewx/tests/test_daily.py diff --git a/bin/weewx/test/test_database.py b/bin/weewx/tests/test_database.py similarity index 100% rename from bin/weewx/test/test_database.py rename to bin/weewx/tests/test_database.py diff --git a/bin/weewx/test/test_restx.py b/bin/weewx/tests/test_restx.py similarity index 100% rename from bin/weewx/test/test_restx.py rename to bin/weewx/tests/test_restx.py diff --git a/bin/weewx/test/test_sim.py b/bin/weewx/tests/test_sim.py similarity index 100% rename from bin/weewx/test/test_sim.py rename to bin/weewx/tests/test_sim.py diff --git a/bin/weewx/test/test_skins/StandardTest/byhour.txt.tmpl b/bin/weewx/tests/test_skins/StandardTest/byhour.txt.tmpl similarity index 100% rename from bin/weewx/test/test_skins/StandardTest/byhour.txt.tmpl rename to bin/weewx/tests/test_skins/StandardTest/byhour.txt.tmpl diff --git a/bin/weewx/test/test_skins/StandardTest/bymonth.txt.tmpl b/bin/weewx/tests/test_skins/StandardTest/bymonth.txt.tmpl similarity index 100% rename from bin/weewx/test/test_skins/StandardTest/bymonth.txt.tmpl rename to bin/weewx/tests/test_skins/StandardTest/bymonth.txt.tmpl diff --git a/bin/weewx/test/test_skins/StandardTest/byrecord.txt.tmpl b/bin/weewx/tests/test_skins/StandardTest/byrecord.txt.tmpl similarity index 100% rename from bin/weewx/test/test_skins/StandardTest/byrecord.txt.tmpl rename to bin/weewx/tests/test_skins/StandardTest/byrecord.txt.tmpl diff --git a/bin/weewx/test/test_skins/StandardTest/byspan.txt.tmpl b/bin/weewx/tests/test_skins/StandardTest/byspan.txt.tmpl similarity index 100% rename from bin/weewx/test/test_skins/StandardTest/byspan.txt.tmpl rename to bin/weewx/tests/test_skins/StandardTest/byspan.txt.tmpl diff --git a/bin/weewx/test/test_skins/StandardTest/byyear.txt.tmpl b/bin/weewx/tests/test_skins/StandardTest/byyear.txt.tmpl similarity index 100% rename from bin/weewx/test/test_skins/StandardTest/byyear.txt.tmpl rename to bin/weewx/tests/test_skins/StandardTest/byyear.txt.tmpl diff --git a/bin/weewx/test/test_skins/StandardTest/index.html.tmpl b/bin/weewx/tests/test_skins/StandardTest/index.html.tmpl similarity index 100% rename from bin/weewx/test/test_skins/StandardTest/index.html.tmpl rename to bin/weewx/tests/test_skins/StandardTest/index.html.tmpl diff --git a/bin/weewx/test/test_skins/StandardTest/skin.conf b/bin/weewx/tests/test_skins/StandardTest/skin.conf similarity index 100% rename from bin/weewx/test/test_skins/StandardTest/skin.conf rename to bin/weewx/tests/test_skins/StandardTest/skin.conf diff --git a/bin/weewx/test/test_templates.py b/bin/weewx/tests/test_templates.py similarity index 100% rename from bin/weewx/test/test_templates.py rename to bin/weewx/tests/test_templates.py diff --git a/bin/weewx/test/test_units.py b/bin/weewx/tests/test_units.py similarity index 100% rename from bin/weewx/test/test_units.py rename to bin/weewx/tests/test_units.py diff --git a/bin/weewx/test/test_wxformulas.py b/bin/weewx/tests/test_wxformulas.py similarity index 100% rename from bin/weewx/test/test_wxformulas.py rename to bin/weewx/tests/test_wxformulas.py diff --git a/bin/weewx/test/testgen.conf b/bin/weewx/tests/testgen.conf similarity index 100% rename from bin/weewx/test/testgen.conf rename to bin/weewx/tests/testgen.conf diff --git a/makefile b/makefile index ef1518ec..d8c62118 100644 --- a/makefile +++ b/makefile @@ -153,7 +153,7 @@ upload-readme: readme.txt # update the version in all relevant places VDOCS=readme.htm customizing.htm devnotes.htm hardware.htm usersguide.htm upgrading.htm utilities.htm -VCONFIGS=weewx.conf bin/weecfg/test/expected/weewx39_user_expected.conf +VCONFIGS=weewx.conf bin/weecfg/tests/expected/weewx39_user_expected.conf version: for f in $(VDOCS); do \ sed -e 's/^Version: [0-9].*/Version: $(MMVERSION)/' docs/$$f > docs/$$f.tmp; \ @@ -310,5 +310,5 @@ critic: cloc: cloc bin @for d in weecfg weedb weeutil weewx; do \ - cloc bin/$$d/test; \ + cloc bin/$$d/tests; \ done