Author: rhs
Date: Wed May 30 11:54:35 2012
New Revision: 1344209
URL: http://svn.apache.org/viewvc?rev=1344209&view=rev
Log:
moved python tests from proton-c to top level and made them switchable between
the c and java engine; added config.sh to set up JYTHONPATH and PYTHONPATH
Added:
qpid/proton/trunk/config.sh
qpid/proton/trunk/proton-c/xproton.py
qpid/proton/trunk/proton-j/xproton.py
qpid/proton/trunk/tests/proton_tests/ (props changed)
- copied from r1344181, qpid/proton/trunk/proton-c/tests/
Removed:
qpid/proton/trunk/proton-c/tests/
Modified:
qpid/proton/trunk/design/ (props changed)
qpid/proton/trunk/design/src/proton/package.html
qpid/proton/trunk/proton-j/ (props changed)
qpid/proton/trunk/tests/proton-test
qpid/proton/trunk/tests/proton_tests/__init__.py
qpid/proton/trunk/tests/proton_tests/engine.py
Added: qpid/proton/trunk/config.sh
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/config.sh?rev=1344209&view=auto
==============================================================================
--- qpid/proton/trunk/config.sh (added)
+++ qpid/proton/trunk/config.sh Wed May 30 11:54:35 2012
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+export PROTON_HOME=$(dirname $(readlink -f $0))
+
+if [ -z "$CPROTON_BUILD" ]; then
+ if [ -d $PROTON_HOME/proton-c/build ]; then
+ export PYTHON_BINDINGS=$PROTON_HOME/proton-c/build/bindings/python
+ else
+ export PYTHON_BINDINGS=$PROTON_HOME/proton-c/bindings/python
+ fi
+else
+ export PYTHON_BINDINGS=$CPROTON_BUILD/bindings/python
+fi
+
+export PYTHONPATH=$PROTON_HOME/tests:$PROTON_HOME/proton-c:$PYTHON_BINDINGS
+export
JYTHONPATH=$PROTON_HOME/tests:$PROTON_HOME/proton-j:$PROTON_HOME/proton-j/dist/lib/qpidproton.jar
Propchange: qpid/proton/trunk/design/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 11:54:35 2012
@@ -0,0 +1,2 @@
+build
+dist
Modified: qpid/proton/trunk/design/src/proton/package.html
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/design/src/proton/package.html?rev=1344209&r1=1344208&r2=1344209&view=diff
==============================================================================
--- qpid/proton/trunk/design/src/proton/package.html (original)
+++ qpid/proton/trunk/design/src/proton/package.html Wed May 30 11:54:35 2012
@@ -68,9 +68,9 @@
</pre>
<p>
- Additionally each endpoint has a local and remote error slot which
- may be filled with additional information regarding why the
- endpoint was transitioned to CLOSED.
+ Additionally each endpoint has an error slot which may be filled
+ with additional information regarding error conditions, e.g. why
+ the remote endpoint was transitioned to CLOSED.
</p>
<h3>Questions:</h3>
Added: qpid/proton/trunk/proton-c/xproton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/xproton.py?rev=1344209&view=auto
==============================================================================
--- qpid/proton/trunk/proton-c/xproton.py (added)
+++ qpid/proton/trunk/proton-c/xproton.py Wed May 30 11:54:35 2012
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+from cproton import *
Propchange: qpid/proton/trunk/proton-j/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 11:54:35 2012
@@ -0,0 +1,3 @@
+build
+dist
+*.class
Added: qpid/proton/trunk/proton-j/xproton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/xproton.py?rev=1344209&view=auto
==============================================================================
--- qpid/proton/trunk/proton-j/xproton.py (added)
+++ qpid/proton/trunk/proton-j/xproton.py Wed May 30 11:54:35 2012
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+from jproton import *
Modified: qpid/proton/trunk/tests/proton-test
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton-test?rev=1344209&r1=1344208&r2=1344209&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton-test (original)
+++ qpid/proton/trunk/tests/proton-test Wed May 30 11:54:35 2012
@@ -102,10 +102,7 @@ for a in args:
includes.append(a.strip())
if not includes:
- if opts.modules:
- includes.append("*")
- else:
- includes.extend(["proton.tests.*"])
+ includes.append("*")
def is_ignored(path):
for p in excludes:
@@ -550,7 +547,7 @@ class Harness:
modules = opts.modules
if not modules:
- modules.extend(["proton.tests"])
+ modules.extend(["proton_tests"])
h = Harness()
for name in modules:
m = __import__(name, None, None, ["dummy"])
Propchange: qpid/proton/trunk/tests/proton_tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 11:54:35 2012
@@ -0,0 +1 @@
+*.class
Modified: qpid/proton/trunk/tests/proton_tests/__init__.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/__init__.py?rev=1344209&r1=1344181&r2=1344209&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/__init__.py (original)
+++ qpid/proton/trunk/tests/proton_tests/__init__.py Wed May 30 11:54:35 2012
@@ -17,4 +17,4 @@
# under the License.
#
-import tests.engine
+import proton_tests.engine
Modified: qpid/proton/trunk/tests/proton_tests/engine.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/engine.py?rev=1344209&r1=1344181&r2=1344209&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/engine.py (original)
+++ qpid/proton/trunk/tests/proton_tests/engine.py Wed May 30 11:54:35 2012
@@ -18,7 +18,7 @@
#
import os
-from cproton import *
+from xproton import *
# future test areas
# different permutations of setup
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
