diff options
| author | Andrey Pampukha <[email protected]> | 2010-03-18 18:02:37 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-06-09 16:19:14 +0200 |
| commit | dd67e73980ac0c8b601079c2e3f27701c367936c (patch) | |
| tree | fabd8e5c7a1495d5140f378934a07f774c837f53 /lib/common_test/test | |
| parent | d7c10478a2287ce3f0c9ac077d835919e2745f91 (diff) | |
| download | otp-dd67e73980ac0c8b601079c2e3f27701c367936c.tar.gz otp-dd67e73980ac0c8b601079c2e3f27701c367936c.tar.bz2 otp-dd67e73980ac0c8b601079c2e3f27701c367936c.zip | |
Fix problem with disappearing variables and aliases
Diffstat (limited to 'lib/common_test/test')
3 files changed, 33 insertions, 21 deletions
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl index a7fa6fe52e..9a0177c2ec 100644 --- a/lib/common_test/test/ct_config_SUITE.erl +++ b/lib/common_test/test/ct_config_SUITE.erl @@ -211,22 +211,33 @@ expected_events(config_static_SUITE)-> expected_events(config_dynamic_SUITE)-> [ - {ct_test_support_eh,start_logging,{'DEF','RUNDIR'}}, - {ct_test_support_eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}, - {ct_test_support_eh,start_info,{1,1,3}}, - {ct_test_support_eh,tc_start,{config_dynamic_SUITE,init_per_suite}}, - {ct_test_support_eh,tc_done,{config_dynamic_SUITE,init_per_suite,ok}}, - {ct_test_support_eh,tc_start,{config_dynamic_SUITE,test_get_known_variable}}, - {ct_test_support_eh,tc_done,{config_dynamic_SUITE,test_get_known_variable,ok}}, - {ct_test_support_eh,test_stats,{1,0,{0,0}}}, - {ct_test_support_eh,tc_start,{config_dynamic_SUITE,test_localtime_update}}, - {ct_test_support_eh,tc_done,{config_dynamic_SUITE,test_localtime_update,ok}}, - {ct_test_support_eh,test_stats,{2,0,{0,0}}}, - {ct_test_support_eh,tc_start,{config_dynamic_SUITE,test_server_pid}}, - {ct_test_support_eh,tc_done,{config_dynamic_SUITE,test_server_pid,ok}}, - {ct_test_support_eh,test_stats,{3,0,{0,0}}}, - {ct_test_support_eh,tc_start,{config_dynamic_SUITE,end_per_suite}}, - {ct_test_support_eh,tc_done,{config_dynamic_SUITE,end_per_suite,ok}}, - {ct_test_support_eh,test_done,{'DEF','STOP_TIME'}}, - {ct_test_support_eh,stop_logging,[]} + {?eh,start_logging,{'DEF','RUNDIR'}}, + {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}, + {?eh,start_info,{1,1,5}}, + {?eh,tc_start,{config_dynamic_SUITE,init_per_suite}}, + {?eh,tc_done,{config_dynamic_SUITE,init_per_suite,ok}}, + {?eh,tc_start,{config_dynamic_SUITE,test_get_known_variable}}, + {?eh,tc_done, + {config_dynamic_SUITE,test_get_known_variable,ok}}, + {?eh,test_stats,{1,0,{0,0}}}, + {?eh,tc_start,{config_dynamic_SUITE,test_localtime_update}}, + {?eh,tc_done,{config_dynamic_SUITE,test_localtime_update,ok}}, + {?eh,test_stats,{2,0,{0,0}}}, + {?eh,tc_start,{config_dynamic_SUITE,test_server_pid}}, + {?eh,tc_done,{config_dynamic_SUITE,test_server_pid,ok}}, + {?eh,test_stats,{3,0,{0,0}}}, + {?eh,tc_start, + {config_dynamic_SUITE,test_disappearable_variable}}, + {?eh,tc_done, + {config_dynamic_SUITE,test_disappearable_variable,ok}}, + {?eh,test_stats,{4,0,{0,0}}}, + {?eh,tc_start, + {config_dynamic_SUITE,test_disappearable_variable_alias}}, + {?eh,tc_done, + {config_dynamic_SUITE,test_disappearable_variable_alias,ok}}, + {?eh,test_stats,{5,0,{0,0}}}, + {?eh,tc_start,{config_dynamic_SUITE,end_per_suite}}, + {?eh,tc_done,{config_dynamic_SUITE,end_per_suite,ok}}, + {?eh,test_done,{'DEF','STOP_TIME'}}, + {?eh,stop_logging,[]} ].
\ No newline at end of file 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 1013c46c7d..ae66d4e9bf 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 @@ -23,7 +23,7 @@ %%% Description: %%% Test suite for common_test which tests the userconfig functionality %%%------------------------------------------------------------------- --module(config_2_SUITE). +-module(config_dynamic_SUITE). -compile(export_all). @@ -150,7 +150,8 @@ test_disappearable_variable_alias(_)-> ct:require(diav, disappearable_variable), hereAmI = ct:get_config(disappearable_variable), hereAmI = ct:get_config(diav), - undefined = ct:reload_config(disappearable_variable), + ct:reload_config(disappearable_variable), + undefined = ct:get_config(disappearable_variable), % after reloading, it's even again Iter3=ct:get_config(config_server_iteration), Iter3 = Iter2+1, diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl index e102c69d3d..d3f07980bc 100644 --- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl +++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl @@ -24,7 +24,7 @@ %%% Test suite for common_test which tests the get_config and require %%% functionality %%%------------------------------------------------------------------- --module(config_1_SUITE). +-module(config_static_SUITE). -compile(export_all). |