From 48c754b93da2eff262b2297f2e51b102adbabfa0 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 10 Sep 2010 14:10:39 +0200
Subject: OTP-8818: Fixed inconsistency in ct:start_interactive call

---
 lib/common_test/test/ct_config_SUITE.erl | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'lib/common_test/test/ct_config_SUITE.erl')

diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 72ff781f82..fc15abc5bc 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -58,6 +58,9 @@ end_per_suite(Config) ->
 init_per_testcase(TestCase, Config) ->
     ct_test_support:init_per_testcase(TestCase, Config).
 
+end_per_testcase(install_config = TestCase, Config) ->
+    ok = rpc:call(proplists:get_value(ct_node, Config), ct_config, stop, []),
+    ct_test_support:end_per_testcase(TestCase, Config);
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
@@ -66,12 +69,13 @@ all(doc) ->
 
 all(suite) ->
     [
-	require,
-	userconfig_static,
-	userconfig_dynamic,
-	testspec_legacy,
-	testspec_static,
-	testspec_dynamic
+     require,
+     install_config,
+     userconfig_static,
+     userconfig_dynamic,
+     testspec_legacy,
+     testspec_static,
+     testspec_dynamic
     ].
 
 %%--------------------------------------------------------------------
@@ -84,6 +88,17 @@ require(Config) when is_list(Config) ->
 	     {config, filename:join(DataDir, "config/config.txt")},
              ["config_static_SUITE"]).
 
+install_config(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    CTNode = proplists:get_value(ct_node, Config),
+    rpc:call(CTNode, ct, install,
+	     [[{config, [filename:join(DataDir, "config/config.txt")]}]]),
+    case rpc:call(CTNode, ct_config, start, [interactive]) of
+	Pid when is_pid(Pid) ->
+	    ok
+    end.
+
+
 userconfig_static(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     run_test(config_static_SUITE,
@@ -135,6 +150,8 @@ testspec_dynamic(Config) when is_list(Config) ->
              []),
     file:delete(filename:join(ConfigDir, "spec_dynamic.spec")).
 
+
+
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
-- 
cgit v1.2.3