Merge branch 'bmk/megaco/fixing_faulty_test_case' into bmk/megaco/megaco31601_integration/r15

4 files changed, 94 insertions, 17 deletions

diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index d9c575885f..39baff28aa 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,6 +36,68 @@
     section is the version number of Megaco.</p>
 
 
+  <section><title>Megaco 3.16.0.1</title>
+
+    <p>Version 3.16.0.1 supports code replacement in runtime from/to
+      version 3.16, 3.15.1.1, 3.15.1 and 3.15.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+	  <p>Fixed some faulty test cases. </p>
+<!--
+          <p>Own Id: OTP-9795</p>
+-->
+        </item>
+
+     </list>
+
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      
+      <p>-</p>
+      
+ <!--
+      <list type="bulleted">
+	<item>
+	  <p>Fixing miscellaneous things detected by dialyzer. </p>
+	  <p>Own Id: OTP-9075</p>
+	</item>
+	
+      </list>
+ -->
+      
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+	  <p>Due to the change in the flex driver API, 
+	  we may no longer be able to build and/or use 
+	  the flex driver without reentrant support. </p>
+          <p>Own Id: OTP-9795</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+  </section> <!-- 3.16 -->
+
+
   <section><title>Megaco 3.16</title>
 
     <p>Version 3.16 supports code replacement in runtime from/to
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 3c9740818a..2737556d09 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. 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
@@ -142,10 +142,17 @@
 %%      |
 %%      v
 %%    3.16
+%%      |
+%%      v
+%%  3.16.0.1
 %%
 %%
 {"%VSN%",
  [
+  {"3.16", 
+   [
+   ]
+  },
   {"3.15.1.1", 
    [
     {restart_application, megaco}
@@ -163,6 +170,10 @@
   }
  ],
  [
+  {"3.16", 
+   [
+   ]
+  },
   {"3.15.1.1", 
    [
     {restart_application, megaco}
diff --git a/lib/megaco/test/megaco_mess_test.erl b/lib/megaco/test/megaco_mess_test.erl
index 8bafab1aba..663ac8c329 100644
--- a/lib/megaco/test/megaco_mess_test.erl
+++ b/lib/megaco/test/megaco_mess_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. 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
@@ -324,9 +324,6 @@
 min(M) -> timer:minutes(M).
 
 %% Test server callbacks
-% init_per_testcase(pending_ack = Case, Config) ->
-%     put(dbg,true),
-%     megaco_test_lib:init_per_testcase(Case, Config);
 init_per_testcase(otp_7189 = Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
     megaco_test_lib:init_per_testcase(Case, [{tc_timeout, min(2)} |C]);
@@ -337,9 +334,6 @@ init_per_testcase(Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
     megaco_test_lib:init_per_testcase(Case, [{tc_timeout, min(1)} |C]).
 
-% end_per_testcase(pending_ack = Case, Config) ->
-%     erase(dbg),
-%     megaco_test_lib:end_per_testcase(Case, Config);
 end_per_testcase(Case, Config) ->
     megaco_test_lib:end_per_testcase(Case, Config).
 
@@ -434,6 +428,7 @@ connect(suite) ->
 connect(doc) ->
     [];
 connect(Config) when is_list(Config) ->
+    %% ?SKIP("Needs a re-write..."),
     ?ACQUIRE_NODES(1, Config),
     PrelMid = preliminary_mid,
     MgMid   = ipv4_mid(4711),
@@ -457,16 +452,25 @@ connect(Config) when is_list(Config) ->
     ?VERIFY(bad_send_mod, megaco:conn_info(PrelCH, send_mod)),
     SC = service_change_request(),
     case megaco:call(PrelCH, [SC], []) of
-	{error, 
-	 {send_message_failed, 
-	  {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}} ->
+	{_Version, 
+	 {error, 
+	  {send_message_failed, 
+	   {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}}
+	} ->
+	    %% R14B and previous
+	    ?LOG("expected send failure (1)", []),
 	    ok;
 	
 	%% As of R15, we also get some extra info (e.g. line numbers)
-	{error, 
-	 {send_message_failed, 
-	  {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _], _} | _]}}}} ->
+	{_Version, 
+	 {error, 
+	  {send_message_failed, 
+	   {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _], _} | _]}}}}
+	} ->
+	    %% R15B and later
+	    ?LOG("expected send failure (2)", []),
 	    ok;
+
 	Unexpected ->
 	    ?ERROR(Unexpected)
     end,
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index bb6f5f554a..11a951a23e 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. 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
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.16
+MEGACO_VSN  = 3.16.0.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"