aboutsummaryrefslogtreecommitdiff
path: root/libcontextsubscriber
diff options
context:
space:
mode:
Diffstat (limited to 'libcontextsubscriber')
-rwxr-xr-xlibcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/commander/commander_appearing.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/commander/commander_disabled.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/commander/commander_nonexistent.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/registry/registry.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/subscription/multiprovider.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/subscription/multiprovider2.py2
-rwxr-xr-xlibcontextsubscriber/customer-tests/subscription/subscription.py2
-rw-r--r--libcontextsubscriber/customer-tests/tests.xml42
-rwxr-xr-xlibcontextsubscriber/propertymonitor/has_provider.py2
-rwxr-xr-xlibcontextsubscriber/propertymonitor/has_value.py2
-rw-r--r--libcontextsubscriber/propertymonitor/tests.xsl4
14 files changed, 35 insertions, 35 deletions
diff --git a/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py b/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py
index 2566ba6f..d7d9090b 100755
--- a/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py
+++ b/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## Copyright (C) 2008, 2009 Nokia. All rights reserved.
##
diff --git a/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py b/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py
index f695e91c..30a53b9a 100755
--- a/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py
+++ b/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## Copyright (C) 2008, 2009 Nokia. All rights reserved.
##
diff --git a/libcontextsubscriber/customer-tests/commander/commander_appearing.py b/libcontextsubscriber/customer-tests/commander/commander_appearing.py
index f74ef60c..1a87c124 100755
--- a/libcontextsubscriber/customer-tests/commander/commander_appearing.py
+++ b/libcontextsubscriber/customer-tests/commander/commander_appearing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
diff --git a/libcontextsubscriber/customer-tests/commander/commander_disabled.py b/libcontextsubscriber/customer-tests/commander/commander_disabled.py
index 1acf1c65..661a6752 100755
--- a/libcontextsubscriber/customer-tests/commander/commander_disabled.py
+++ b/libcontextsubscriber/customer-tests/commander/commander_disabled.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
diff --git a/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py b/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py
index c073786a..d595961b 100755
--- a/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py
+++ b/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
diff --git a/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py b/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
index a1ee1fbe..0f3614e0 100755
--- a/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
+++ b/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
diff --git a/libcontextsubscriber/customer-tests/registry/registry.py b/libcontextsubscriber/customer-tests/registry/registry.py
index 32a193c1..1bba40a9 100755
--- a/libcontextsubscriber/customer-tests/registry/registry.py
+++ b/libcontextsubscriber/customer-tests/registry/registry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
diff --git a/libcontextsubscriber/customer-tests/subscription/multiprovider.py b/libcontextsubscriber/customer-tests/subscription/multiprovider.py
index 47709a2c..9760438b 100755
--- a/libcontextsubscriber/customer-tests/subscription/multiprovider.py
+++ b/libcontextsubscriber/customer-tests/subscription/multiprovider.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## Copyright (C) 2008, 2009 Nokia. All rights reserved.
##
diff --git a/libcontextsubscriber/customer-tests/subscription/multiprovider2.py b/libcontextsubscriber/customer-tests/subscription/multiprovider2.py
index d715324d..eba6333e 100755
--- a/libcontextsubscriber/customer-tests/subscription/multiprovider2.py
+++ b/libcontextsubscriber/customer-tests/subscription/multiprovider2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## Copyright (C) 2008, 2009 Nokia. All rights reserved.
##
diff --git a/libcontextsubscriber/customer-tests/subscription/subscription.py b/libcontextsubscriber/customer-tests/subscription/subscription.py
index 3a64ae91..3ab64dc5 100755
--- a/libcontextsubscriber/customer-tests/subscription/subscription.py
+++ b/libcontextsubscriber/customer-tests/subscription/subscription.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## @file contextOrientationTCs.py
## This file is part of ContextKit.
diff --git a/libcontextsubscriber/customer-tests/tests.xml b/libcontextsubscriber/customer-tests/tests.xml
index 1a408f49..f4402f10 100644
--- a/libcontextsubscriber/customer-tests/tests.xml
+++ b/libcontextsubscriber/customer-tests/tests.xml
@@ -11,89 +11,89 @@
<!-- At least one case per set, name mandatory, description mandatory, other optional -->
<case name="async" 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 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/asynchronicity;python2.5 /usr/share/libcontextsubscriber-tests/asynchronicity/asynchronicity.py</step>
</case>
<!-- At least one case per set, name mandatory, description mandatory, other optional -->
<case name="commander-appearing" description="This test verifies that properties are overriden by commander" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python /usr/share/libcontextsubscriber-tests/commander/commander_appearing.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python2.5 /usr/share/libcontextsubscriber-tests/commander/commander_appearing.py</step>
</case>
<!-- At least one case per set, name mandatory, description mandatory, other optional -->
<case name="commander-nonexistent" description="This test verifies that nonexistent properties are handled by commander" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python /usr/share/libcontextsubscriber-tests/commander/commander_nonexistent.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python2.5 /usr/share/libcontextsubscriber-tests/commander/commander_nonexistent.py</step>
</case>
<!-- At least one case per set, name mandatory, description mandatory, other optional -->
<case name="commander-disabled" description="This test verifies that disabling commander restore actual properties values" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python /usr/share/libcontextsubscriber-tests/commander/commander_disabled.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python2.5 /usr/share/libcontextsubscriber-tests/commander/commander_disabled.py</step>
</case>
<!-- At least one case per set, name mandatory, description mandatory, other optional -->
<case name="registry" description="getting info from introspection API" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/registry;python /usr/share/libcontextsubscriber-tests/registry/registry.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/registry;python2.5 /usr/share/libcontextsubscriber-tests/registry/registry.py</step>
</case>
<case name="subscription1" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testValue</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testValue</step>
</case>
<case name="subscription2" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testInfos</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testInfos</step>
</case>
<case name="subscription3" description="Reading the type information from introspection" requirement="" timeout="20">
- <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 Subscription.testTypes</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testTypes</step>
</case>
<case name="subscription4" description="Reading the provider information from introspection" requirement="" timeout="20">
- <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 Subscription.testProviders</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testProviders</step>
</case>
<case name="subscription5" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testAllDataTypes</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testAllDataTypes</step>
</case>
<!-- Environments optional - tells where the tests are run -->
<case name="subscription6" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testTruthTypePermutations</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testTruthTypePermutations</step>
</case>
<case name="subscription7" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testStringTypePermutations</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testStringTypePermutations</step>
</case>
<case name="subscription8" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testInitialSubscription</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testInitialSubscription</step>
</case>
<case name="subscription9" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testValueChanged</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testValueChanged</step>
</case>
<case name="subscription10" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleProviders.testTwoProviders</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleProviders.testTwoProviders</step>
</case>
<case name="subscription11" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testPause</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testPause</step>
</case>
<case name="subscription12" description="This test verifies that subscription to properties" 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 CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testWaitForSubscribe</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testWaitForSubscribe</step>
</case>
<case name="plugin" description="Plugin loading of libcontextsubscriber" requirement="" timeout="20">
- <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; 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=.; cd /usr/share/libcontextsubscriber-tests/pluginchanging;python2.5 /usr/share/libcontextsubscriber-tests/pluginchanging/pluginchanging.py</step>
</case>
<case name="multiprovider" description="Multiple providers"
requirement="" timeout="20">
- <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python multiprovider.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python2.5 multiprovider.py</step>
</case>
<case name="multiprovider2" description="Multiprovider timestamp"
requirement="" timeout="20">
- <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python multiprovider2.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python2.5 multiprovider2.py</step>
</case>
<case name="rapidchanges" description="Rapid changes"
requirement="" timeout="20">
- <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/asynchronicity; python rapidchanges.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/asynchronicity; python2.5 rapidchanges.py</step>
</case>
<case name="update-contextkit-providers" description="CDB database generation"
requirement="" timeout="20">
diff --git a/libcontextsubscriber/propertymonitor/has_provider.py b/libcontextsubscriber/propertymonitor/has_provider.py
index 5c6c9cad..f718828f 100755
--- a/libcontextsubscriber/propertymonitor/has_provider.py
+++ b/libcontextsubscriber/propertymonitor/has_provider.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## Copyright (C) 2008, 2009 Nokia. All rights reserved.
##
diff --git a/libcontextsubscriber/propertymonitor/has_value.py b/libcontextsubscriber/propertymonitor/has_value.py
index df5363e4..2192fe76 100755
--- a/libcontextsubscriber/propertymonitor/has_value.py
+++ b/libcontextsubscriber/propertymonitor/has_value.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## Copyright (C) 2008, 2009 Nokia. All rights reserved.
##
diff --git a/libcontextsubscriber/propertymonitor/tests.xsl b/libcontextsubscriber/propertymonitor/tests.xsl
index e8a02d12..421896fc 100644
--- a/libcontextsubscriber/propertymonitor/tests.xsl
+++ b/libcontextsubscriber/propertymonitor/tests.xsl
@@ -12,12 +12,12 @@
<case requirement="" timeout="20">
<xsl:attribute name="name"><xsl:value-of select="@name"/>-provider</xsl:attribute>
<xsl:attribute name="description">Provider for <xsl:value-of select="@name"/></xsl:attribute>
- <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python /usr/share/propertymonitor-tests/has_provider.py <xsl:value-of select="@name"/></step>
+ <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python2.5 /usr/share/propertymonitor-tests/has_provider.py <xsl:value-of select="@name"/></step>
</case>
<case requirement="" timeout="20">
<xsl:attribute name="name"> <xsl:value-of select="@name"/>-value</xsl:attribute>
<xsl:attribute name="description">Value for <xsl:value-of select="@name"/></xsl:attribute>
- <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python /usr/share/propertymonitor-tests/has_value.py <xsl:value-of select="@name"/></step>
+ <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python2.5 /usr/share/propertymonitor-tests/has_value.py <xsl:value-of select="@name"/></step>
</case>
</xsl:for-each>
<environments>