diff --git a/farmbot_celery_script/Elixir.FarmbotCeleryScript.SysCalls.Stubs-5524.coverdata b/farmbot_celery_script/Elixir.FarmbotCeleryScript.SysCalls.Stubs-5524.coverdata new file mode 100644 index 00000000..0a04ab59 Binary files /dev/null and b/farmbot_celery_script/Elixir.FarmbotCeleryScript.SysCalls.Stubs-5524.coverdata differ diff --git a/farmbot_celery_script/coveralls.json b/farmbot_celery_script/coveralls.json index 2b87e2de..7b91515c 100644 --- a/farmbot_celery_script/coveralls.json +++ b/farmbot_celery_script/coveralls.json @@ -2,5 +2,6 @@ "skip_files": [ "lib/farmbot_celery_script/compiler/tools.ex" ], + "minimum_coverage": 53, "treat_no_relevant_lines_as_covered": true } diff --git a/farmbot_celery_script/fixture/corpus.json b/farmbot_celery_script/fixture/corpus.json index e2843d58..b5ddba86 100644 --- a/farmbot_celery_script/fixture/corpus.json +++ b/farmbot_celery_script/fixture/corpus.json @@ -92,7 +92,6 @@ "calibrate", "change_ownership", "check_updates", - "dump_info", "emergency_lock", "emergency_unlock", "execute", @@ -832,18 +831,6 @@ ], "docs": "" }, - { - "allowed_args": [], - "allowed_body_types": [], - "name": "dump_info", - "tags": [ - "function", - "network_user", - "disk_user", - "api_writer" - ], - "docs": "Sends an info dump to server administrators for troubleshooting." - }, { "allowed_args": [], "allowed_body_types": [], @@ -1170,7 +1157,6 @@ "calibrate", "change_ownership", "check_updates", - "dump_info", "emergency_lock", "emergency_unlock", "execute", @@ -1242,7 +1228,6 @@ "calibrate", "change_ownership", "check_updates", - "dump_info", "emergency_lock", "emergency_unlock", "execute", diff --git a/farmbot_celery_script/test/farmbot_celery_script/corpus/node_test.exs b/farmbot_celery_script/test/farmbot_celery_script/corpus/node_test.exs index 5709cd3b..e34e2aec 100644 --- a/farmbot_celery_script/test/farmbot_celery_script/corpus/node_test.exs +++ b/farmbot_celery_script/test/farmbot_celery_script/corpus/node_test.exs @@ -3,7 +3,10 @@ defmodule FarmbotCeleryScript.Corpus.NodeTest do alias FarmbotCeleryScript.Corpus test "inspect" do - assert "Sequence(version, locals) [calibrate, change_ownership, check_updates, emergency_lock, emergency_unlock, execute, execute_script, factory_reset, find_home, flash_firmware, home, install_farmware, install_first_party_farmware, _if, move_absolute, move_relative, power_off, read_pin, read_status, reboot, remove_farmware, resource_update, send_message, set_servo_angle, set_user_env, sync, take_photo, toggle_pin, update_farmware, wait, write_pin, zero]" = - inspect(Corpus.sequence()) + a = + "Sequence(version, locals) [calibrate, change_ownership, check_updates, emergency_lock, emergency_unlock, execute, execute_script, factory_reset, find_home, flash_firmware, home, install_farmware, install_first_party_farmware, _if, move_absolute, move_relative, power_off, read_pin, read_status, reboot, remove_farmware, resource_update, send_message, set_servo_angle, set_user_env, sync, take_photo, toggle_pin, update_farmware, wait, write_pin, zero]" + + b = inspect(Corpus.sequence()) + assert a == b end end diff --git a/farmbot_os/config/config.exs b/farmbot_os/config/config.exs index 533cd15d..24d5e951 100644 --- a/farmbot_os/config/config.exs +++ b/farmbot_os/config/config.exs @@ -1,6 +1,7 @@ use Mix.Config -config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent, checkup_time_ms: 10_000 +config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.FarmEvent, + checkup_time_ms: 10_000 config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.RegimenInstance, checkup_time_ms: 10_000 @@ -18,9 +19,11 @@ config :farmbot_core, FarmbotCore.AssetWorker.FarmbotCore.Asset.PinBinding, gpio_handler: FarmbotCore.PinBindingWorker.StubGPIOHandler, error_retry_time_ms: 30_000 -config :farmbot_core, FarmbotCore.Leds, gpio_handler: FarmbotCore.Leds.StubHandler +config :farmbot_core, FarmbotCore.Leds, + gpio_handler: FarmbotCore.Leds.StubHandler -config :farmbot_core, FarmbotCore.JSON, json_parser: FarmbotCore.JSON.JasonParser +config :farmbot_core, FarmbotCore.JSON, + json_parser: FarmbotCore.JSON.JasonParser # Customize non-Elixir parts of the firmware. See # https://hexdocs.pm/nerves/advanced-configuration.html for details. @@ -43,13 +46,15 @@ config :farmbot_core, FarmbotCore.EctoMigrator, "beta" ) -config :farmbot_celery_script, FarmbotCeleryScript.SysCalls, sys_calls: FarmbotOS.SysCalls +config :farmbot_celery_script, FarmbotCeleryScript.SysCalls, + sys_calls: FarmbotOS.SysCalls config :farmbot_core, FarmbotCore.BotState.FileSystem, root_dir: "/tmp/farmbot_state", sleep_time: 200 -config :farmbot_core, FarmbotCore.FarmwareRuntime, runtime_dir: "/tmp/farmware_runtime" +config :farmbot_core, FarmbotCore.FarmwareRuntime, + runtime_dir: "/tmp/farmware_runtime" config :ecto, json_library: FarmbotCore.JSON @@ -60,13 +65,16 @@ config :farmbot_core, FarmbotCore.Asset.Repo ] -config :farmbot_ext, FarmbotExt.API.Preloader, preloader_impl: FarmbotExt.API.Preloader.HTTP +config :farmbot_ext, FarmbotExt.API.Preloader, + preloader_impl: FarmbotExt.API.Preloader.HTTP config :farmbot, FarmbotOS.FileSystem, data_path: "/tmp/farmbot" -config :farmbot, FarmbotOS.System, system_tasks: FarmbotOS.Platform.Host.SystemTasks +config :farmbot, FarmbotOS.System, + system_tasks: FarmbotOS.Platform.Host.SystemTasks -config :farmbot, FarmbotOS.Configurator, network_layer: FarmbotOS.Configurator.FakeNetworkLayer +config :farmbot, FarmbotOS.Configurator, + network_layer: FarmbotOS.Configurator.FakeNetworkLayer config :farmbot, FarmbotOS.Platform.Supervisor, platform_children: [ diff --git a/farmbot_os/coveralls.json b/farmbot_os/coveralls.json index 2b2285d8..287eb974 100644 --- a/farmbot_os/coveralls.json +++ b/farmbot_os/coveralls.json @@ -1,6 +1,6 @@ { "coverage_options": { "treat_no_relevant_lines_as_covered": true, - "minimum_coverage": 22 + "minimum_coverage": 25 } } diff --git a/farmbot_os/lib/farmbot_os/configurator/router.ex b/farmbot_os/lib/farmbot_os/configurator/router.ex index 31c20a4e..06e754a3 100644 --- a/farmbot_os/lib/farmbot_os/configurator/router.ex +++ b/farmbot_os/lib/farmbot_os/configurator/router.ex @@ -23,7 +23,9 @@ defmodule FarmbotOS.Configurator.Router do plug(:match) plug(:dispatch) - @network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[:network_layer] + @network_layer Application.get_env(:farmbot, FarmbotOS.Configurator)[ + :network_layer + ] @telemetry_layer FarmbotOS.Configurator.DetsTelemetryLayer # Trigger for captive portal for various operating systems