diff options
| author | Siri Hansen <[email protected]> | 2013-11-29 10:47:25 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-11-29 10:47:25 +0100 |
| commit | 3b6f02df56823a122ca12ca84eda52c436f78e44 (patch) | |
| tree | b3594b85da362d588b74601078e10e9d712ae1a5 /lib/observer/test | |
| parent | 0279799e4f3d2404f657863d04d8c1d6f6c08985 (diff) | |
| parent | 70039d8c87a0af63e865cdfd91c809c274b590d1 (diff) | |
| download | otp-3b6f02df56823a122ca12ca84eda52c436f78e44.tar.gz otp-3b6f02df56823a122ca12ca84eda52c436f78e44.tar.bz2 otp-3b6f02df56823a122ca12ca84eda52c436f78e44.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[observer] Fix copy/paste error in observer_SUITE:app_file/1
[common_test] Minor corrections in test of ct_netconfc
Diffstat (limited to 'lib/observer/test')
| -rw-r--r-- | lib/observer/test/observer_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl index 8dea0d8ea8..b6665cb70b 100644 --- a/lib/observer/test/observer_SUITE.erl +++ b/lib/observer/test/observer_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2011. All Rights Reserved. +%% Copyright Ericsson AB 2006-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -66,5 +66,5 @@ app_file(suite) -> app_file(doc) -> ["Testing .app file"]; app_file(Config) when is_list(Config) -> - ?line ok = ?t:app_test(os_mon), + ?line ok = ?t:app_test(observer), ok. |