Repository: qpid-proton-j Updated Branches: refs/heads/master 23bdf7b47 -> bca685d42
PROTON-1385: rename a class from the python test shim to avoid shadowing file of same name from jython, allows tests to run on Appveyor Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/6c978012 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/6c978012 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/6c978012 Branch: refs/heads/master Commit: 6c9780125cee2bcaf3e97822a375b93e9881f67c Parents: 23bdf7b Author: Robert Gemmell <[email protected]> Authored: Thu Jan 19 15:05:01 2017 +0000 Committer: Robert Gemmell <[email protected]> Committed: Thu Jan 19 15:05:01 2017 +0000 ---------------------------------------------------------------------- tests/java/shim/cproton.py | 2 +- tests/java/shim/cprotontypes.py | 21 +++++++++++++++++++++ tests/java/shim/ctypes.py | 21 --------------------- 3 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/6c978012/tests/java/shim/cproton.py ---------------------------------------------------------------------- diff --git a/tests/java/shim/cproton.py b/tests/java/shim/cproton.py index ec7feec..d775cab 100644 --- a/tests/java/shim/cproton.py +++ b/tests/java/shim/cproton.py @@ -28,7 +28,7 @@ PN_VERSION_MAJOR = 0 PN_VERSION_MINOR = 0 PN_VERSION_POINT = 0 -from ctypes import * +from cprotontypes import * from cobject import * from cerror import * from ccodec import * http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/6c978012/tests/java/shim/cprotontypes.py ---------------------------------------------------------------------- diff --git a/tests/java/shim/cprotontypes.py b/tests/java/shim/cprotontypes.py new file mode 100644 index 0000000..bd88b17 --- /dev/null +++ b/tests/java/shim/cprotontypes.py @@ -0,0 +1,21 @@ +# +# 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 proton/types.h +PN_MILLIS_MAX = 4294967295 http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/6c978012/tests/java/shim/ctypes.py ---------------------------------------------------------------------- diff --git a/tests/java/shim/ctypes.py b/tests/java/shim/ctypes.py deleted file mode 100644 index bd88b17..0000000 --- a/tests/java/shim/ctypes.py +++ /dev/null @@ -1,21 +0,0 @@ -# -# 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 proton/types.h -PN_MILLIS_MAX = 4294967295 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
