diff --git a/Makefile b/Makefile index 6c9ec3e4412..99435407da1 100755 --- a/Makefile +++ b/Makefile @@ -100,7 +100,6 @@ JAVASHIM_DEPS = $(shell git ls-files core/chaincode/shim/java) PROTOS = $(shell git ls-files *.proto | grep -v vendor) # No sense rebuilding when non production code is changed PROJECT_FILES = $(shell git ls-files | grep -v ^test | grep -v ^unit-test | \ - grep -v ^bddtests | grep -v ^docs | grep -v _test.go$ | grep -v .md$ | \ grep -v ^.git | grep -v ^examples | grep -v ^devenv | grep -v .png$ | \ grep -v ^LICENSE | grep -v ^vendor ) RELEASE_TEMPLATES = $(shell git ls-files | grep "release/templates") diff --git a/devenv/bddtests-requirements.txt b/devenv/bddtests-requirements.txt deleted file mode 100644 index 364268bac54..00000000000 --- a/devenv/bddtests-requirements.txt +++ /dev/null @@ -1,37 +0,0 @@ -# pip install behave -# pip install \ -# b3j0f.aop \ -# ecdsa \ -# enum34 \ -# grpcio \ -# Jinja2 \ -# protobuf \ -# pyOpenSSL \ -# pysha3 \ -# python-slugify \ -# PyYAML -asn1crypto==0.22.0 -b3j0f.aop==0.8.4 -b3j0f.utils==1.4.4 -behave==1.2.5 -cffi==1.10.0 -cryptography==2.0 -ecdsa==0.13 -enum34==1.1.6 -futures==3.1.1 -grpcio==1.4.0 -idna==2.5 -ipaddress==1.0.18 -Jinja2==2.9.6 -MarkupSafe==1.0 -ordereddict==1.1 -parse==1.8.2 -parse-type==0.3.4 -protobuf==3.3.0 -pycparser==2.18 -pyOpenSSL==17.1.0 -pysha3==1.0.2 -python-slugify==1.2.4 -PyYAML==3.12 -six==1.10.0 -Unidecode==0.4.21 diff --git a/devenv/setup.sh b/devenv/setup.sh index 87bc6f4f73c..fe4984f4c11 100755 --- a/devenv/setup.sh +++ b/devenv/setup.sh @@ -83,11 +83,6 @@ curl -sL $GO_URL | (cd $GOROOT && tar --strip-components 1 -xz) # ---------------------------------------------------------------- runuser -l ubuntu -c '/hyperledger/fabric/devenv/install_nvm.sh' -# ---------------------------------------------------------------- -# Install Behave -# ---------------------------------------------------------------- -/hyperledger/fabric/scripts/install_behave.sh - # ---------------------------------------------------------------- # Install Java # ---------------------------------------------------------------- diff --git a/devenv/setupRHELonZ.sh b/devenv/setupRHELonZ.sh index 277ee6ec08b..fe1491aa9e3 100644 --- a/devenv/setupRHELonZ.sh +++ b/devenv/setupRHELonZ.sh @@ -18,7 +18,7 @@ # cd $HOME/git/src/github.com/hyperledger # git clone http://gerrit.hyperledger.org/r/fabric # source fabric/devenv/setupRHELonZ.sh -# make peer unit-test behave +# make peer unit-test if [ xroot != x$(whoami) ] then @@ -80,7 +80,7 @@ yum install python-setuptools curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py" python get-pip.py pip install --upgrade pip -pip install behave nose docker-compose +pip install nose docker-compose ################ #grpcio package @@ -100,7 +100,7 @@ GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . # updater-server, update-engine, and update-service-common dependencies (for running locally) pip install -I flask==0.10.1 python-dateutil==2.2 pytz==2014.3 pyyaml==3.10 couchdb==1.0 flask-cors==2.0.1 requests==2.4.3 pyOpenSSL==16.2.0 pysha3==1.0b1 -#PIP packages required for some behave tests +#PIP packages required for some tests pip install urllib3 ndg-httpsclient pyasn1 ecdsa python-slugify grpcio-tools jinja2 b3j0f.aop cat >> ~/.bashrc <`__. -Running Behave BDD Tests -~~~~~~~~~~~~~~~~~~~~~~~~ - -**Note:** currently, the behave tests must be run from within in the -Vagrant environment. See the :doc:`development environment ` setup instructions -if you have not already set up your Vagrant environment. - -`Behave `__ tests will setup networks -of peers with different security and consensus configurations and verify -that transactions run properly. To run these tests - -:: - - cd $GOPATH/src/github.com/hyperledger/fabric - make behave - -Some of the Behave tests run inside Docker containers. If a test fails -and you want to have the logs from the Docker containers, run the tests -with this option: - -:: - - cd $GOPATH/src/github.com/hyperledger/fabric/bddtests - behave -D logs=Y - Building outside of Vagrant --------------------------- @@ -111,7 +86,7 @@ development environment. :: cd $GOPATH/src/github.com/hyperledger/fabric - make peer unit-test behave + make peer unit-test Building on Power Platform ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst index c3f77d4803e..959aa401d7d 100644 --- a/docs/source/dev-setup/devenv.rst +++ b/docs/source/dev-setup/devenv.rst @@ -55,16 +55,13 @@ Prerequisites - Note: The BIOS Enabled Virtualization may be within the CPU or Security settings of the BIOS -``pip`` and ``behave`` -~~~~~~~~~~~~~~~~~~~~~~ +``pip`` +~~~~~~ :: pip install --upgrade pip - #PIP packages required for some behave tests - pip install -r devenv/bddtests-requirements.txt - Steps ~~~~~ diff --git a/docs/source/kafka.rst b/docs/source/kafka.rst index 1910afce7bc..3d14ade26f2 100644 --- a/docs/source/kafka.rst +++ b/docs/source/kafka.rst @@ -83,10 +83,5 @@ Debugging Set ``General.LogLevel`` to ``DEBUG`` and ``Kafka.Verbose`` in ``orderer.yaml`` to ``true``. -Example -------- - -Sample Docker Compose configuration files inline with the recommended settings above can be found under the ``fabric/bddtests`` directory. Look for ``dc-orderer-kafka-base.yml`` and ``dc-orderer-kafka.yml``. - .. Licensed under Creative Commons Attribution 4.0 International License https://creativecommons.org/licenses/by/4.0/ diff --git a/scripts/containerlogs.sh b/scripts/containerlogs.sh deleted file mode 100644 index a32a91806b8..00000000000 --- a/scripts/containerlogs.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - - -cd $HOME/gopath/src/github.com/hyperledger/fabric/bddtests - -count=$(git ls-files -o | wc -l) - -git ls-files -o - -echo ">>>>>>>>> CONTAINERS LOG FILES <<<<<<<<<<<<" - -for (( i=1; i<"$count";i++ )) - -do - -file=$(echo $(git ls-files -o | sed "${i}q;d")) - -echo "$file" - -cat $file | curl -sT - chunk.io - -done -echo " >>>>> testsummary log file <<<< " -cat testsummary.log | curl -sT - chunk.io diff --git a/scripts/install_behave.sh b/scripts/install_behave.sh deleted file mode 100755 index 049ea7f1b15..00000000000 --- a/scripts/install_behave.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - - -# -# This script is used on Debian based linux distros. -# (i.e., linux that supports the apt packaging manager.) -# - -# Update system -apt-get update -qq - -# Install Python, pip, behave -# -# install python-dev and libyaml-dev to get compiled speedups -apt-get install --yes python-dev -apt-get install --yes libyaml-dev - -apt-get install --yes python-setuptools -apt-get install --yes python-pip -apt-get install --yes build-essential -# required dependencies for cryptography, which is required by pyOpenSSL -# https://cryptography.io/en/stable/installation/#building-cryptography-on-linux -apt-get install --yes libssl-dev libffi-dev -pip install --upgrade pip - -# Pip packages required for behave tests -pip install -r ../devenv/bddtests-requirements.txt - -# install ruby and apiaryio -#apt-get install --yes ruby ruby-dev gcc -#gem install apiaryio - -# Install Tcl prerequisites for busywork -apt-get install --yes tcl tclx tcllib - -# Install NPM for the SDK -apt-get install --yes npm