From b428cda36b3fc692e7feee3452cde0d76f110566 Mon Sep 17 00:00:00 2001 From: James Fish Date: Wed, 4 Mar 2015 21:19:52 +0000 Subject: Fix parsing list of one test directory in ct:run_test/1 Fix support for the following cases for ct:run_test/1 options: * [{dir, [Dir]}, {suite, _}, ...] * [{dir, [Dir]}, {suite, Suite}, {group, _}, ...] * [{dir, [Dir]}, {suite, Suite}, {case, _}, ...] Previously these options would result in a function_clause error as {dir, [Dir]} was not handled when combined with a suite. --- lib/common_test/src/ct_run.erl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/common_test') diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 33c4f352b0..632901837c 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -1627,11 +1627,15 @@ groups_and_cases(Gs, Cs) -> tests(TestDir, Suites, []) when is_list(TestDir), is_integer(hd(TestDir)) -> [{?testdir(TestDir,Suites),ensure_atom(Suites),all}]; tests(TestDir, Suite, Cases) when is_list(TestDir), is_integer(hd(TestDir)) -> + [{?testdir(TestDir,Suite),ensure_atom(Suite),Cases}]; +tests([TestDir], Suite, Cases) when is_list(TestDir), is_integer(hd(TestDir)) -> [{?testdir(TestDir,Suite),ensure_atom(Suite),Cases}]. tests([{Dir,Suite}],Cases) -> [{?testdir(Dir,Suite),ensure_atom(Suite),Cases}]; tests(TestDir, Suite) when is_list(TestDir), is_integer(hd(TestDir)) -> - tests(TestDir, ensure_atom(Suite), all). + tests(TestDir, ensure_atom(Suite), all); +tests([TestDir], Suite) when is_list(TestDir), is_integer(hd(TestDir)) -> + tests(TestDir, ensure_atom(Suite), all). tests(DirSuites) when is_list(DirSuites), is_tuple(hd(DirSuites)) -> [{?testdir(Dir,Suite),ensure_atom(Suite),all} || {Dir,Suite} <- DirSuites]; tests(TestDir) when is_list(TestDir), is_integer(hd(TestDir)) -> -- cgit v1.2.3 From 603ffe32e1947e2c9550eabe15c477c343cbaba1 Mon Sep 17 00:00:00 2001 From: Peter Andersson Date: Fri, 8 May 2015 17:50:59 +0200 Subject: Update version numbers and app dependencies --- lib/common_test/src/common_test.app.src | 11 ++++++----- lib/common_test/vsn.mk | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'lib/common_test') diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src index 580d5dbd7b..0be1466fc9 100644 --- a/lib/common_test/src/common_test.app.src +++ b/lib/common_test/src/common_test.app.src @@ -63,9 +63,10 @@ ct_master_logs]}, {applications, [kernel,stdlib]}, {env, []}, - {runtime_dependencies,["xmerl-1.3.7","webtool-0.8.10","tools-2.6.14", - "test_server-3.7.1","stdlib-2.0","ssh-3.0.1", - "snmp-4.25.1","sasl-2.4","runtime_tools-1.8.14", - "kernel-3.0","inets-5.10","erts-6.0", - "debugger-4.0","crypto-3.3","compiler-5.0"]}]}. + {runtime_dependencies,["xmerl-1.3.8","tools-2.8", + "test_server-3.9","stdlib-2.5","ssh-4.0", + "snmp-5.1.2","sasl-2.4.2","runtime_tools-1.8.16", + "kernel-4.0","inets-6.0","erts-7.0", + "debugger-4.1","crypto-3.6","compiler-6.0", + "observer-2.1"]}]}. diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index e2d921729c..ff2bd20ab3 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.10.1 +COMMON_TEST_VSN = 1.11 -- cgit v1.2.3 From e09dd66dc4d89c62ddfd8c19791f9678d5d787c6 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 12 May 2015 18:18:55 +0200 Subject: Prepare release --- lib/common_test/doc/src/notes.xml | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'lib/common_test') diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index 472e3b7833..218f76d403 100644 --- a/lib/common_test/doc/src/notes.xml +++ b/lib/common_test/doc/src/notes.xml @@ -32,6 +32,79 @@ notes.xml +
Common_Test 1.11 + +
Fixed Bugs and Malfunctions + + +

+ The status of an aborted test due to test suite + compilation error has changed from 'auto_skipped' to + 'failed'. This affects both the textual log file, event + handling and CT hook callbacks. The logging of + compilation failures has also been improved, especially + in the case of multiple test suites failing compilation.

+

+ Own Id: OTP-10816

+ + +
+ + +
Improvements and New Features + + +

+ Earlier there was no way to add optional parameters like + default-operation to an edit-config request sent with + ct_netconfc:edit_config/3,4, you had to use + ct_netconfc:send_rpc/2,3. For simplicity and completion, + a new optional argument, OptParams, is now added to the + edit_config function.

+

+ Own Id: OTP-10446 Aux Id: kunagi-266 [177]

+ + +

+ When running OTP tests using the ts interface, it is now + possible to specify so called test categories per OTP + application. A test category is represented by a CT test + specification and defines an arbitrary subset of existing + test suites, groups and cases. Examples of test + categories are 'smoke' (smoke tests) and 'bench' + (benchmarks). (Call ts:help() for more info). Also, + functions for reading terms from the current test + specification during test, ct:get_testspec_terms/0 and + ct:get_testspec_terms/1, have been implemented.

+

+ Own Id: OTP-11962

+ + +

+ Obsolete scripts and make file operations have been + removed and the installation chapter in the Common Test + User's Guide has been updated.

+

+ Own Id: OTP-12421

+ + +

+ The 'keep_alive' interval has been reduced to 8 seconds, + which is two seconds shorter than the default + 'idle_timeout' value for ct_telnet:expect/3. This way, + the telnet server receives a NOP message (which might + trigger an action) before the operation times out. Also + the TCP option 'nodelay' has been enabled per default for + all telnet connections, in order to reduce the risk for + communication timeouts.

+

+ Own Id: OTP-12678 Aux Id: seq12818

+ + +
+ +
+
Common_Test 1.10.1
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 9a81b28598fadc44bf506354c9227e41aac786f6 Mon Sep 17 00:00:00 2001 From: Henrik Nord Date: Wed, 13 May 2015 09:40:16 +0200 Subject: Revert "Prepare release" This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6. --- lib/common_test/doc/src/notes.xml | 73 --------------------------------------- 1 file changed, 73 deletions(-) (limited to 'lib/common_test') diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index 218f76d403..472e3b7833 100644 --- a/lib/common_test/doc/src/notes.xml +++ b/lib/common_test/doc/src/notes.xml @@ -32,79 +32,6 @@ notes.xml -
Common_Test 1.11 - -
Fixed Bugs and Malfunctions - - -

- The status of an aborted test due to test suite - compilation error has changed from 'auto_skipped' to - 'failed'. This affects both the textual log file, event - handling and CT hook callbacks. The logging of - compilation failures has also been improved, especially - in the case of multiple test suites failing compilation.

-

- Own Id: OTP-10816

- - -
- - -
Improvements and New Features - - -

- Earlier there was no way to add optional parameters like - default-operation to an edit-config request sent with - ct_netconfc:edit_config/3,4, you had to use - ct_netconfc:send_rpc/2,3. For simplicity and completion, - a new optional argument, OptParams, is now added to the - edit_config function.

-

- Own Id: OTP-10446 Aux Id: kunagi-266 [177]

- - -

- When running OTP tests using the ts interface, it is now - possible to specify so called test categories per OTP - application. A test category is represented by a CT test - specification and defines an arbitrary subset of existing - test suites, groups and cases. Examples of test - categories are 'smoke' (smoke tests) and 'bench' - (benchmarks). (Call ts:help() for more info). Also, - functions for reading terms from the current test - specification during test, ct:get_testspec_terms/0 and - ct:get_testspec_terms/1, have been implemented.

-

- Own Id: OTP-11962

- - -

- Obsolete scripts and make file operations have been - removed and the installation chapter in the Common Test - User's Guide has been updated.

-

- Own Id: OTP-12421

- - -

- The 'keep_alive' interval has been reduced to 8 seconds, - which is two seconds shorter than the default - 'idle_timeout' value for ct_telnet:expect/3. This way, - the telnet server receives a NOP message (which might - trigger an action) before the operation times out. Also - the TCP option 'nodelay' has been enabled per default for - all telnet connections, in order to reduce the risk for - communication timeouts.

-

- Own Id: OTP-12678 Aux Id: seq12818

- - -
- -
-
Common_Test 1.10.1
Fixed Bugs and Malfunctions -- cgit v1.2.3