← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/megaco/test/megaco_mib_test.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/megaco/test/megaco_mib_test.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
5
5
%% 
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
63
63
            megaco_test_lib:init_per_testcase(Case, Config)
64
64
    end.
65
65
 
66
 
fin_per_testcase(Case, Config) ->
 
66
end_per_testcase(Case, Config) ->
67
67
    process_flag(trap_exit, false),
68
 
    megaco_test_lib:fin_per_testcase(Case, Config).
 
68
    megaco_test_lib:end_per_testcase(Case, Config).
69
69
 
70
70
 
71
71
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
72
72
 
73
 
all(suite) ->
74
 
    Cases = 
75
 
        [
76
 
         plain,
77
 
         connect,
78
 
         traffic
79
 
        ],
80
 
    Cases.
 
73
all() -> 
 
74
    [plain, connect, traffic].
 
75
 
 
76
groups() -> 
 
77
    [].
 
78
 
 
79
init_per_group(_GroupName, Config) ->
 
80
    Config.
 
81
 
 
82
end_per_group(_GroupName, Config) ->
 
83
    Config.
 
84
 
81
85
 
82
86
 
83
87
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%