Fixed plugingchanging test

Signed-off-by: Marja Hassinen <ext-marja.2.hassinen@nokia.com>

3 files changed, 8 insertions, 10 deletions

diff --git a/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py b/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
index 9a5866c1..3645d847 100755
--- a/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
+++ b/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
@@ -47,8 +47,8 @@ class Subscription(unittest.TestCase):
 		os.environ["CONTEXT_PROVIDERS"] = "."
 		# We need 2 plugins which are in separate directories.
 		os.environ["CONTEXT_SUBSCRIBER_PLUGINS"] = "."
-		os.system('cp ../testplugins/libcontextsubscribertime1.so* .')
-		os.system('cp ../testplugins/libcontextsubscribertime2.so* .')
+		os.system('cp ../testplugins/libcontextsubscribertime1.so.0.0.0 ./libcontextsubscribertime1.so')
+		os.system('cp ../testplugins/libcontextsubscribertime2.so.0.0.0 ./libcontextsubscribertime2.so')
 
 		self.context_client = CLTool("context-listen", "Test.Time")
 
diff --git a/libcontextsubscriber/customer-tests/runTests.sh b/libcontextsubscriber/customer-tests/runTests.sh
index eec28a2d..885311fb 100755
--- a/libcontextsubscriber/customer-tests/runTests.sh
+++ b/libcontextsubscriber/customer-tests/runTests.sh
@@ -8,8 +8,8 @@ DIRS="commander subscription asynchronicity registry pluginchanging"
 if pkg-config contextprovider-1.0 || [ -e ../../libcontextprovider/src/.libs/libcontextprovider.so ]
 then
 	# Copy built test plugin .so's closer to the test program
-	cp testplugins/timeplugin1/.libs/libcontextsubscribertime1.so.0.0.0 testplugins/libcontextsubscribertime1.so
-	cp testplugins/timeplugin2/.libs/libcontextsubscribertime2.so.0.0.0 testplugins/libcontextsubscribertime2.so
+	cp testplugins/timeplugin1/.libs/libcontextsubscribertime1.so.0.0.0 testplugins/
+	cp testplugins/timeplugin2/.libs/libcontextsubscribertime2.so.0.0.0 testplugins/
 
 	for dir in $DIRS; do
 		echo "Running tests in $dir"
@@ -19,8 +19,8 @@ then
 		done
 		cd ..
 	done
-	rm testplugins/libcontextsubscribertime1.so
-	rm testplugins/libcontextsubscribertime2.so
+	rm testplugins/libcontextsubscribertime1.so.0.0.0
+	rm testplugins/libcontextsubscribertime2.so.0.0.0
 
 else
 	echo "libcontextprovider is not installed nor built"
diff --git a/libcontextsubscriber/customer-tests/tests.xml b/libcontextsubscriber/customer-tests/tests.xml
index e312fb9f..bbfd5354 100644
--- a/libcontextsubscriber/customer-tests/tests.xml
+++ b/libcontextsubscriber/customer-tests/tests.xml
@@ -10,8 +10,7 @@
       <!-- At least one case per set, name mandatory, description mandatory, other optional -->
       <case name="libsub001" description="This test verifies that the asynchronicity of the subscriber library" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export PYTHONPATH=$PYTHONPATH:../common ; export CONTEXT_PROVIDERS=.;cd
-        /usr/share/libcontextsubscriber-tests/asynchronicity;python /usr/share/libcontextsubscriber-tests/asynchronicity/asynchronicity.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export PYTHONPATH=$PYTHONPATH:/usr/share/libcontextsubscriber-tests/common ; export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/asynchronicity;python /usr/share/libcontextsubscriber-tests/asynchronicity/asynchronicity.py</step>
       </case>
       <!-- At least one case per set, name mandatory, description mandatory, other optional -->
       <case name="libsub002" description="This test verifies that properties are overriden by commander" requirement="" timeout="20">
@@ -75,8 +74,7 @@
         <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testWaitForSubscribe</step>
       </case>
       <case name="libsub016" description="Plugin loading of libcontextsubscriber" requirement="" timeout="20">
-        <step expected_result="0">. /tmp/session_bus_address.user;export PYTHONPATH=$PYTHONPATH:../common ; cd
-        /usr/share/libcontextsubscriber-tests/pluginchanging ; python /usr/share/libcontextsubscriber-tests/pluginchanging/pluginchanging.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;export PYTHONPATH=$PYTHONPATH:/usr/share/libcontextsubscriber-tests/common ;cd /usr/share/libcontextsubscriber-tests/pluginchanging;python /usr/share/libcontextsubscriber-tests/pluginchanging/pluginchanging.py</step>
       </case>
 
       <environments>