diff options
| author | Siri Hansen <[email protected]> | 2016-03-09 11:03:20 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-03-09 11:03:20 +0100 |
| commit | 2e8369fa0932e076bda89fa6f15f9f3b99de074a (patch) | |
| tree | 742dcbe8e0c703724a11d20bf9587b14ef9557ca /lib/stdlib/test | |
| parent | fb44a4de532ae97b3424078577dee7370078dea0 (diff) | |
| parent | 4d6a434a3c84a1ebc339314f3c2c340510a62be9 (diff) | |
| download | otp-2e8369fa0932e076bda89fa6f15f9f3b99de074a.tar.gz otp-2e8369fa0932e076bda89fa6f15f9f3b99de074a.tar.bz2 otp-2e8369fa0932e076bda89fa6f15f9f3b99de074a.zip | |
Merge branch 'siri/test-ct_release_test/OTP-13390' into maint
* siri/test-ct_release_test/OTP-13390:
Remove upgrade tests from stdlib_SUITE
Add test of ct_release_test
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/stdlib_SUITE.erl | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl index a586729b30..fa9d0f6b55 100644 --- a/lib/stdlib/test/stdlib_SUITE.erl +++ b/lib/stdlib/test/stdlib_SUITE.erl @@ -31,10 +31,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> - [app_test, appup_test, assert_test, {group,upgrade}]. - -groups() -> - [{upgrade,[minor_upgrade,major_upgrade]}]. + [app_test, appup_test, assert_test]. init_per_suite(Config) -> Config. @@ -42,13 +39,9 @@ init_per_suite(Config) -> end_per_suite(_Config) -> ok. -init_per_group(upgrade, Config) -> - ct_release_test:init(Config); init_per_group(_GroupName, Config) -> Config. -end_per_group(upgrade, Config) -> - ct_release_test:cleanup(Config); end_per_group(_GroupName, Config) -> Config. @@ -165,29 +158,6 @@ check_appup([],_,_) -> ok. -minor_upgrade(Config) -> - ct_release_test:upgrade(stdlib,minor,{?MODULE,[]},Config). - -major_upgrade(Config) -> - ct_release_test:upgrade(stdlib,major,{?MODULE,[]},Config). - -%% Version numbers are checked by ct_release_test, so there is nothing -%% more to check here... -upgrade_init(CtData,State) -> - {ok,{FromVsn,ToVsn}} = ct_release_test:get_app_vsns(CtData,stdlib), - case ct_release_test:get_appup(CtData,stdlib) of - {ok,{FromVsn,ToVsn,[restart_new_emulator],[restart_new_emulator]}} -> - io:format("Upgrade/downgrade ~p <--> ~p",[FromVsn,ToVsn]); - {error,{vsn_not_found,_}} when FromVsn==ToVsn -> - io:format("No upgrade test for stdlib, same version") - end, - State. -upgrade_upgraded(_CtData,State) -> - State. -upgrade_downgraded(_CtData,State) -> - State. - - -include_lib("stdlib/include/assert.hrl"). -include_lib("stdlib/include/assert.hrl"). % test repeated inclusion assert_test(suite) -> |