diff options
| author | Siri Hansen <[email protected]> | 2016-06-15 15:30:35 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-06-15 15:30:35 +0200 |
| commit | 37464e088e9f4268c1d54d56d7cb31bec1cc140f (patch) | |
| tree | 4f51c344b8e6195e739520c99931f70071a3d686 /lib | |
| parent | 2ce17d44eba8993985f49abafc78d6c0f99bef27 (diff) | |
| parent | c8a4098692b5ad5c813f7f97557800ea638db652 (diff) | |
| download | otp-37464e088e9f4268c1d54d56d7cb31bec1cc140f.tar.gz otp-37464e088e9f4268c1d54d56d7cb31bec1cc140f.tar.bz2 otp-37464e088e9f4268c1d54d56d7cb31bec1cc140f.zip | |
Merge branch 'siri/cuddle-master'
* siri/cuddle-master:
Add short sleep when killing slave nodes
[ct test] Do reload_config instead of get_config
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl | 7 | ||||
| -rw-r--r-- | lib/stdlib/test/slave_SUITE.erl | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl index 0b3f834732..20fdf1034b 100644 --- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl +++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl @@ -73,7 +73,7 @@ test_get_known_variable(_)-> % localtime will be updated in 5 seconds, check that test_localtime_update(_)-> Seconds = 5, - LT1 = ct:get_config(localtime), + LT1 = ct:reload_config(localtime), timer:sleep(Seconds*1000), % don't want scaling of this timer LT2 = ct:reload_config(localtime), case is_diff_ok(LT1, LT2, Seconds) of @@ -137,6 +137,11 @@ my_dt_to_datetime([{date, D},{time, T}])-> is_diff_ok(DT1, DT2, Seconds)-> GS1 = calendar:datetime_to_gregorian_seconds(my_dt_to_datetime(DT1)), GS2 = calendar:datetime_to_gregorian_seconds(my_dt_to_datetime(DT2)), + ct:log("Checking diff~n" + "DT1: ~p, gregorian seconds: ~p~n" + "DT2: ~p, gregorian seconds: ~p~n" + "Diff: ~p", + [DT1,GS1,DT2,GS2,GS2-GS1]), if GS2-GS1 > Seconds+Seconds/2; GS2-GS1 < Seconds-Seconds/2-> diff --git a/lib/stdlib/test/slave_SUITE.erl b/lib/stdlib/test/slave_SUITE.erl index 25b706e81f..7525cf78de 100644 --- a/lib/stdlib/test/slave_SUITE.erl +++ b/lib/stdlib/test/slave_SUITE.erl @@ -71,6 +71,7 @@ t_start_link(Config) when is_list(Config) -> rpc:cast(Slave1, erlang, halt, []), rpc:cast(Slave2, erlang, halt, []), + ct:sleep(250), is_dead(Slave1), is_dead(Slave2), |