diff options
| author | Luke Bakken <luke@bakken.io> | 2021-12-20 09:10:52 -0800 |
|---|---|---|
| committer | mergify-bot <noreply@mergify.com> | 2021-12-21 14:53:36 +0000 |
| commit | db9dac10e94674bc287eeb2239f40c80363900e5 (patch) | |
| tree | 459c0a27bab372ecbed85b7ad0b1657e6f5999f6 | |
| parent | 98846c9407bb7091f15e2e1f0b5be8fc79f59874 (diff) | |
| download | rabbitmq-server-git-db9dac10e94674bc287eeb2239f40c80363900e5.tar.gz | |
Fix tests
(cherry picked from commit 7a3ab5e7377788ebf6dbeb05cd20528418b29fb3)
(cherry picked from commit a41aafd22011be38badb0fd1f7004d378a5327f1)
| -rw-r--r-- | deps/rabbit/src/rabbit_disk_monitor.erl | 8 | ||||
| -rw-r--r-- | deps/rabbit/test/unit_disk_monitor_mocks_SUITE.erl | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/deps/rabbit/src/rabbit_disk_monitor.erl b/deps/rabbit/src/rabbit_disk_monitor.erl index 905d441a05..0a543f9589 100644 --- a/deps/rabbit/src/rabbit_disk_monitor.erl +++ b/deps/rabbit/src/rabbit_disk_monitor.erl @@ -188,8 +188,12 @@ code_change(_OldVsn, State, _Extra) -> safe_ets_lookup(Key, Default) -> try - [{Key, Value}] = ets:lookup(?ETS_NAME, Key), - Value + case ets:lookup(?ETS_NAME, Key) of + [{Key, Value}] -> + Value; + [] -> + Default + end catch error:badarg -> Default diff --git a/deps/rabbit/test/unit_disk_monitor_mocks_SUITE.erl b/deps/rabbit/test/unit_disk_monitor_mocks_SUITE.erl index 80fa3d2e09..ae16cbb379 100644 --- a/deps/rabbit/test/unit_disk_monitor_mocks_SUITE.erl +++ b/deps/rabbit/test/unit_disk_monitor_mocks_SUITE.erl @@ -88,7 +88,7 @@ disk_monitor_enable1(_Config) -> application:set_env(rabbit, disk_monitor_failure_retry_interval, 100), ok = rabbit_sup:stop_child(rabbit_disk_monitor_sup), ok = rabbit_sup:start_delayed_restartable_child(rabbit_disk_monitor, [1000]), - undefined = rabbit_disk_monitor:get_disk_free(), + unknown = rabbit_disk_monitor:get_disk_free(), Cmd = case os:type() of {win32, _} -> " Le volume dans le lecteur C n’a pas de nom.\n" " Le numéro de série du volume est 707D-5BDC\n" |