diff options
| author | Michael Goulish <mgoulish@apache.org> | 2010-10-26 15:25:40 +0000 |
|---|---|---|
| committer | Michael Goulish <mgoulish@apache.org> | 2010-10-26 15:25:40 +0000 |
| commit | 9a0b147fce9af6609e8b1ce1338aaec2dd369ebc (patch) | |
| tree | c16431d373fcdc3d681fb3c81f2b4811dbd9ca34 /cpp/src/tests | |
| parent | 20aeba57098bd0b55894bfdf00f4fc0d545188f0 (diff) | |
| download | qpid-python-9a0b147fce9af6609e8b1ce1338aaec2dd369ebc.tar.gz | |
This code's purpose was only to print out the sasl version into the logs
so that I could grep for it in the sasl_fed test. But it is breaking the
windows build. So I am backing it out, and temporarily disabling the
sasl_fed test until I can implement something a little less grotesque.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1027594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rwxr-xr-x | cpp/src/tests/sasl_fed | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/cpp/src/tests/sasl_fed b/cpp/src/tests/sasl_fed index 00b08d3016..b57c57f89a 100755 --- a/cpp/src/tests/sasl_fed +++ b/cpp/src/tests/sasl_fed @@ -1,5 +1,27 @@ #! /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. +# + +# disable this test for all sasl verisons temporarily until TODO, below, is completed. +exit 0 + source test_env.sh sasl_config_file=$builddir/sasl_config @@ -44,15 +66,7 @@ broker_2_port=`cat $tmp_root/broker_2_port` sleep 2 -# Grep the sasl version out of broker 2's log -sasl_version=`cat $tmp_root/qpidd_2.log | grep "SASL enabled" | tr ' ' '\n' | tail -1` - -# Minimum sasl version I can use is 2.1.22 == (2<<16) + (1<<8) + 22 == 131350. -if [ "$sasl_version" -lt "131350" ]; then - echo "sasl_fed test requires SASL version 2.1.22 or greater" - # but this should not cause a test failure. - exit 0 -fi +# TODO -- check for SASL version here, and exit 0 if it is less than 2.1.22 == 131350. # I am not randomizing these names, because the test creates its own brokers. |