qpid-dispatch git commit: NO-JIRA - Minor fix to system_tests_autolinks. Remnoved the use of literal values

2018-04-09 Thread gmurthy 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 86834e7ba -> a2acb1724


NO-JIRA - Minor fix to system_tests_autolinks. Remnoved the use of literal 
values


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/a2acb172
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/a2acb172
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/a2acb172

Branch: refs/heads/master
Commit: a2acb1724d09bf7081c8d9f8672eecfd1039e5bc
Parents: 86834e7
Author: Ganesh Murthy 
Authored: Mon Apr 9 16:48:56 2018 -0400
Committer: Ganesh Murthy 
Committed: Mon Apr 9 16:48:56 2018 -0400

--
 tests/system_tests_autolinks.py | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a2acb172/tests/system_tests_autolinks.py
--
diff --git a/tests/system_tests_autolinks.py b/tests/system_tests_autolinks.py
index ec6c73f..89cc76c 100644
--- a/tests/system_tests_autolinks.py
+++ b/tests/system_tests_autolinks.py
@@ -552,7 +552,7 @@ class 
AutolinkMultipleReceiverUsingMyListenerTest(MessagingHandler):
 self.normal_address = normal_address
 self.route_address = route_address
 self.dest = addr
-self.count = 2
+self.count = 10
 self.normal_conn = None
 self.route_conn1 = None
 self.route_conn2 = None
@@ -578,6 +578,9 @@ class 
AutolinkMultipleReceiverUsingMyListenerTest(MessagingHandler):
 self.route_conn2.close()
 
 def on_start(self, event):
+if self.count % 2 != 0:
+self.error = "Count must be a multiple of 2"
+return
 self.timer = event.reactor.schedule(TIMEOUT, Timeout(self))
 self.normal_conn = event.container.connect(self.normal_address)
 self.route_conn1 = event.container.connect(self.route_address)
@@ -612,7 +615,7 @@ class 
AutolinkMultipleReceiverUsingMyListenerTest(MessagingHandler):
 if event.receiver == self.route_conn_rcv2:
 self.rcv2_received += 1
 
-if self.rcv1_received == 1 and self.rcv2_received == 1:
+if self.rcv1_received == self.count/2 and self.rcv2_received == 
self.count/2:
 self.timer.cancel()
 self.normal_conn.close()
 self.route_conn1.close()


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-dispatch git commit: NO-JIRA - Update doc attributes. This closes #281

2018-04-09 Thread gmurthy 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master d821bbd74 -> 86834e7ba


NO-JIRA - Update doc attributes. This closes #281


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/86834e7b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/86834e7b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/86834e7b

Branch: refs/heads/master
Commit: 86834e7baf4104fd37effafec3d34ee85dc7dbc0
Parents: d821bbd
Author: Ben Hardesty 
Authored: Thu Apr 5 14:07:52 2018 -0400
Committer: Ganesh Murthy 
Committed: Mon Apr 9 15:17:37 2018 -0400

--
 doc/new-book/attributes.adoc | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/86834e7b/doc/new-book/attributes.adoc
--
diff --git a/doc/new-book/attributes.adoc b/doc/new-book/attributes.adoc
index 7e0127a..0162710 100644
--- a/doc/new-book/attributes.adoc
+++ b/doc/new-book/attributes.adoc
@@ -42,7 +42,7 @@ under the License
 :FragmentDir: common
 :RouterName: Dispatch Router
 :RouterSchemaDir: ../../build/doc/book
-:RouterVersion: 1.0.1
+:DispatchRouterVersion: 1.0.1
 
 // Book names
 
@@ -50,24 +50,24 @@ under the License
 
 // Doc links
 
-:BookUrlBase: https://qpid.apache.org/releases/qpid-dispatch-{RouterVersion}
+:DispatchRouterUrlBase: 
https://qpid.apache.org/releases/qpid-dispatch-{DispatchRouterVersion}
 
-:ManagementEntitiesUrl: {BookUrlBase}/man/managementschema.html
+:ManagementEntitiesUrl: {DispatchRouterUrlBase}/man/managementschema.html
 :ManagementEntitiesLink: link:{ManagementEntitiesUrl}[{RouterName} Management 
Schema^] 
 
-:RouterBookUrl: {BookUrlBase}/book/book.html
+:RouterBookUrl: {DispatchRouterUrlBase}/book/book.html
 :RouterBookLink: link:{RouterBookUrl}[{RouterBook}]
 
-:qdmanageManPageUrl: {BookUrlBase}/man/qdmanage.html
+:qdmanageManPageUrl: {DispatchRouterUrlBase}/man/qdmanage.html
 :qdmanageManPageLink: link:{qdmanageManPageUrl}[qdmanage man page^]
 
-:qdrouterdManPageUrl: {BookUrlBase}/man/qdrouterd.html
+:qdrouterdManPageUrl: {DispatchRouterUrlBase}/man/qdrouterd.html
 :qdrouterdManPageLink: link:{qdrouterdManPageUrl}[qdrouterd man page^]
 
-:qdrouterdConfManPageUrl: {BookUrlBase}/man/qdrouterd.conf.html
-:qdrouterdConfManPageLink: link:{qdrouterdManPageUrl}[qdrouterd.conf man page]
+:qdrouterdConfManPageUrl: {DispatchRouterUrlBase}/man/qdrouterd.conf.html
+:qdrouterdConfManPageLink: link:{qdrouterdConfManPageUrl}[qdrouterd.conf man 
page^]
 
-:qdstatManPageUrl: {BookUrlBase}/man/qdstat.html
+:qdstatManPageUrl: {DispatchRouterUrlBase}/man/qdstat.html
 :qdstatManPageLink: link:{qdstatManPageUrl}[qdstat man page^]
 
 :ClientAmqpPythonUrl: https://qpid.apache.org/proton/


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-proton git commit: PROTON-1794: Improve python module detection - Specifically detecting/running tox

2018-04-09 Thread astitcher 
Repository: qpid-proton
Updated Branches:
  refs/heads/master bdd986a1d -> e91457c7e


PROTON-1794: Improve python module detection
- Specifically detecting/running tox

[reapplied as this was overwritten in the source tree reorg]


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e91457c7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e91457c7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e91457c7

Branch: refs/heads/master
Commit: e91457c7ed2bf7caee9414b19df54264fba71444
Parents: bdd986a
Author: Andrew Stitcher 
Authored: Mon Apr 9 13:41:56 2018 -0400
Committer: Andrew Stitcher 
Committed: Mon Apr 9 13:41:56 2018 -0400

--
 CMakeLists.txt | 61 +++--
 1 file changed, 31 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e91457c7/CMakeLists.txt
--
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 571fbee..4e05d48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,39 +378,40 @@ if (BUILD_PYTHON)
   ${PYTHON_EXECUTABLE} -- ${python_coverage_options} 
"${py_root}/proton-test")
   set_tests_properties(python-test PROPERTIES PASS_REGULAR_EXPRESSION "Totals: 
.* 0 failed")
 
-  # Eventually, we'll get rid of this check when other
-  # platforms will be supported. Since `setup.py` will skip
-  # the build for non linux plaforms, it doesn't make sense
-  # to try to run them.
-  option(TOX_TEST "Enable muti-version python testing with TOX" ON)
-  set(tox_default "py26,py27,py33,py34,py35,py36")
-  set(TOX_ENVLIST ${tox_default} CACHE STRING "List of python environments for 
TOX tests" )
-  if (NOT (TOX_ENVLIST STREQUAL tox_default))
-message(WARNING "non-default TOX test set '${TOX_ENVLIST}' (default 
'${tox_default}')")
-  endif()
-  if (CMAKE_SYSTEM_NAME STREQUAL Linux AND TOX_TEST)
-find_program(TOX_EXE "tox")
-if (CMAKE_BUILD_TYPE MATCHES "Coverage")
-  message(STATUS "Building for coverage analysis; skipping the 
python-tox-tests")
-elseif (TOX_EXE)
-  configure_file(
-"${CMAKE_CURRENT_SOURCE_DIR}/misc/tox.ini.in"
-"${CMAKE_CURRENT_BINARY_DIR}/tox.ini")
-  add_test (NAME python-tox-test
-COMMAND ${PN_ENV_SCRIPT}
+  check_python_module("tox" TOX_MODULE_FOUND)
+  if (NOT TOX_MODULE_FOUND)
+message(STATUS "The tox tool is not available; skipping the 
python-tox-tests")
+  else ()
+option(ENABLE_TOX_TEST "Enable multi-version python testing with TOX" ON)
+
+set(tox_default "py26,py27,py33,py34,py35,py36")
+set(TOX_ENVLIST ${tox_default} CACHE STRING "List of python environments 
for TOX tests" )
+mark_as_advanced(TOX_ENVLIST)
+
+if (NOT (TOX_ENVLIST STREQUAL tox_default))
+  message(WARNING "non-default TOX test set '${TOX_ENVLIST}' (default 
'${tox_default}')")
+endif()
+if (ENABLE_TOX_TEST)
+  if (CMAKE_BUILD_TYPE MATCHES "Coverage")
+message(STATUS "Building for coverage analysis; skipping the 
python-tox-tests")
+  else ()
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/misc/tox.ini.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/tox.ini")
+add_test (NAME python-tox-test
+  COMMAND ${PN_ENV_SCRIPT}
   "PATH=${py_path}"
   "SASLPASSWD=${SASLPASSWD_EXE}"
   "SWIG=${SWIG_EXECUTABLE}"
-  ${VALGRIND_ENV}
-  ${TOX_EXE})
-  set_tests_properties(python-tox-test
-   PROPERTIES
- PASS_REGULAR_EXPRESSION "Totals: .* ignored, 0 
failed"
- FAIL_REGULAR_EXPRESSION "ERROR:[ ]+py[0-9]*: 
commands failed")
-else (TOX_EXE)
-  message(STATUS "The tox tool is not available; skipping the 
python-tox-tests")
-endif ()
-  endif (CMAKE_SYSTEM_NAME STREQUAL Linux AND TOX_TEST)
+  ${VALGRIND_ENV} --
+  ${PYTHON_EXECUTABLE} -m tox)
+set_tests_properties(python-tox-test
+ PROPERTIES
+   PASS_REGULAR_EXPRESSION "Totals: .* ignored, 0 
failed"
+   FAIL_REGULAR_EXPRESSION "ERROR:[ ]+py[0-9]*: 
commands failed")
+  endif ()
+endif (ENABLE_TOX_TEST)
+  endif (NOT TOX_MODULE_FOUND)
 endif (BUILD_PYTHON)
 
 install (FILES LICENSE.txt README.md


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org