This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 35114d5fccf2285cbaccf316a5a9b742f82cd609
Merge: 1ee18ac cd4aa9f
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sat Mar 27 00:30:34 2021 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
pylib/cassandra-cqlsh-tests.sh | 16 ++++++++++++++++
.../apache/cassandra/stress/util/TimingIntervals.java | 18 ++++++++++++++++++
2 files changed, 34 insertions(+)
diff --cc pylib/cassandra-cqlsh-tests.sh
index 8174636,0000000..a219485
mode 100755,000000..100755
--- a/pylib/cassandra-cqlsh-tests.sh
+++ b/pylib/cassandra-cqlsh-tests.sh
@@@ -1,107 -1,0 +1,123 @@@
+#!/bin/bash -x
++#
++# 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.
+
+################################
+#
+# Prep
+#
+################################
+
+WORKSPACE=$1
+
+if [ "${WORKSPACE}" = "" ]; then
+ echo "Specify Cassandra source directory"
+ exit
+fi
+
+export PYTHONIOENCODING="utf-8"
+export PYTHONUNBUFFERED=true
+export CASS_DRIVER_NO_EXTENSIONS=true
+export CASS_DRIVER_NO_CYTHON=true
+export CCM_MAX_HEAP_SIZE="2048M"
+export CCM_HEAP_NEWSIZE="200M"
+export CCM_CONFIG_DIR=${WORKSPACE}/.ccm
+export NUM_TOKENS="32"
+export CASSANDRA_DIR=${WORKSPACE}
+export TESTSUITE_NAME="cqlshlib.python2.jdk8"
+
+# Loop to prevent failure due to maven-ant-tasks not downloading a jar..
+for x in $(seq 1 3); do
+ ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar
+ RETURN="$?"
+ if [ "${RETURN}" -eq "0" ]; then
+ break
+ fi
+done
+# Exit, if we didn't build successfully
+if [ "${RETURN}" -ne "0" ]; then
+ echo "Build failed with exit code: ${RETURN}"
+ exit ${RETURN}
+fi
+
+# Set up venv with dtest dependencies
+set -e # enable immediate exit if venv setup fails
+virtualenv --python=python2 --no-site-packages venv
+source venv/bin/activate
+pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt
+pip freeze
+
+if [ "$cython" = "yes" ]; then
+ TESTSUITE_NAME="${TESTSUITE_NAME}.cython"
+ pip install "Cython>=0.20,<0.25"
+ cd pylib/; python setup.py build_ext --inplace
+ cd ${WORKSPACE}
+else
+ TESTSUITE_NAME="${TESTSUITE_NAME}.no_cython"
+fi
+
+################################
+#
+# Main
+#
+################################
+
+ccm remove test || true # in case an old ccm cluster is left behind
+ccm create test -n 1 --install-dir=${CASSANDRA_DIR}
+ccm updateconf "enable_user_defined_functions: true"
+
+version_from_build=$(ccm node1 versionfrombuild)
+export pre_or_post_cdc=$(python -c """from distutils.version import
LooseVersion
+print \"postcdc\" if LooseVersion(\"${version_from_build}\") >= \"3.8\" else
\"precdc\"
+""")
+case "${pre_or_post_cdc}" in
+ postcdc)
+ ccm updateconf "cdc_enabled: true"
+ ;;
+ precdc)
+ :
+ ;;
+ *)
+ echo "${pre_or_post_cdc}" is an invalid value.
+ exit 1
+ ;;
+esac
+
+ccm start --wait-for-binary-proto
+
+cd ${CASSANDRA_DIR}/pylib/cqlshlib/
+
+set +e # disable immediate exit from this point
+nosetests
+
+ccm remove
+# hack around --xunit-prefix-with-testsuite-name not being available in nose
1.3.7
+sed -i "s/testsuite name=\"nosetests\"/testsuite
name=\"${TESTSUITE_NAME}\"/g" nosetests.xml
+sed -i "s/testcase classname=\"cqlshlib./testcase
classname=\"${TESTSUITE_NAME}./g" nosetests.xml
+mv nosetests.xml ${WORKSPACE}/cqlshlib.xml
+
+################################
+#
+# Clean
+#
+################################
+
+# /virtualenv
+deactivate
+
+# Exit cleanly for usable "Unstable" status
+exit 0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
