Skip to content

Commit

Permalink
[FAB-9991] Cleanup bddtests/behave references
Browse files Browse the repository at this point in the history
We no longer use behave in the fabric repo.

Change-Id: I636736bcd76e8582f111855c392f4ee3be2bcc62
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
  • Loading branch information
sykesm committed May 10, 2018
1 parent 4ecb0d3 commit 1d98632
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 157 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
37 changes: 0 additions & 37 deletions devenv/bddtests-requirements.txt

This file was deleted.

5 changes: 0 additions & 5 deletions devenv/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ----------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions devenv/setupRHELonZ.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 <<HEREDOC
Expand Down
8 changes: 4 additions & 4 deletions devenv/setupUbuntuOnPPC64le.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ apt-get -y install software-properties-common curl git sudo wget "build-essentia
#####################################
# Install and setup Docker services #
#####################################
# Along with docker.io, aufs-tools also needs to be installed as 'auplink' which is part of aufs-tools package gets invoked during behave tests.
# Along with docker.io, aufs-tools also needs to be installed as 'auplink' which is part of aufs-tools package
apt-get -y install docker.io aufs-tools

# Set DOCKER_OPTS and restart Docker daemon.
Expand All @@ -69,14 +69,14 @@ export GOROOT="/opt/go"
ln -s /usr/local/go $GOROOT

################################################
# Install PIP tools, behave and docker-compose #
# Install PIP tools and docker-compose #
################################################

apt-get -y install python-pip libssl-dev libffi-dev libltdl-dev
pip install --upgrade pip
pip install behave nose docker-compose
pip install nose docker-compose

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 grpcio==1.0.4 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 six
27 changes: 1 addition & 26 deletions docs/source/dev-setup/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,31 +49,6 @@ client SDK is not broken by your changes. To run the Node.js unit tests,
follow the instructions
`here <https://github.com/hyperledger/fabric-sdk-node/blob/master/README.md>`__.

Running Behave BDD Tests
~~~~~~~~~~~~~~~~~~~~~~~~

**Note:** currently, the behave tests must be run from within in the
Vagrant environment. See the :doc:`development environment <devenv>` setup instructions
if you have not already set up your Vagrant environment.

`Behave <https://pypi.python.org/pypi/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
---------------------------

Expand Down Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
7 changes: 2 additions & 5 deletions docs/source/dev-setup/devenv.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~
Expand Down
5 changes: 0 additions & 5 deletions docs/source/kafka.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/
29 changes: 0 additions & 29 deletions scripts/containerlogs.sh

This file was deleted.

42 changes: 0 additions & 42 deletions scripts/install_behave.sh

This file was deleted.

0 comments on commit 1d98632

Please sign in to comment.