Skip to content

Commit 1d98632

Browse files
committed
[FAB-9991] Cleanup bddtests/behave references
We no longer use behave in the fabric repo. Change-Id: I636736bcd76e8582f111855c392f4ee3be2bcc62 Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
1 parent 4ecb0d3 commit 1d98632

10 files changed

+10
-157
lines changed

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ JAVASHIM_DEPS = $(shell git ls-files core/chaincode/shim/java)
100100
PROTOS = $(shell git ls-files *.proto | grep -v vendor)
101101
# No sense rebuilding when non production code is changed
102102
PROJECT_FILES = $(shell git ls-files | grep -v ^test | grep -v ^unit-test | \
103-
grep -v ^bddtests | grep -v ^docs | grep -v _test.go$ | grep -v .md$ | \
104103
grep -v ^.git | grep -v ^examples | grep -v ^devenv | grep -v .png$ | \
105104
grep -v ^LICENSE | grep -v ^vendor )
106105
RELEASE_TEMPLATES = $(shell git ls-files | grep "release/templates")

devenv/bddtests-requirements.txt

-37
This file was deleted.

devenv/setup.sh

-5
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@ curl -sL $GO_URL | (cd $GOROOT && tar --strip-components 1 -xz)
8383
# ----------------------------------------------------------------
8484
runuser -l ubuntu -c '/hyperledger/fabric/devenv/install_nvm.sh'
8585

86-
# ----------------------------------------------------------------
87-
# Install Behave
88-
# ----------------------------------------------------------------
89-
/hyperledger/fabric/scripts/install_behave.sh
90-
9186
# ----------------------------------------------------------------
9287
# Install Java
9388
# ----------------------------------------------------------------

devenv/setupRHELonZ.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# cd $HOME/git/src/github.com/hyperledger
1919
# git clone http://gerrit.hyperledger.org/r/fabric
2020
# source fabric/devenv/setupRHELonZ.sh
21-
# make peer unit-test behave
21+
# make peer unit-test
2222

2323
if [ xroot != x$(whoami) ]
2424
then
@@ -80,7 +80,7 @@ yum install python-setuptools
8080
curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
8181
python get-pip.py
8282
pip install --upgrade pip
83-
pip install behave nose docker-compose
83+
pip install nose docker-compose
8484

8585
################
8686
#grpcio package
@@ -100,7 +100,7 @@ GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install .
100100
# updater-server, update-engine, and update-service-common dependencies (for running locally)
101101
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
102102

103-
#PIP packages required for some behave tests
103+
#PIP packages required for some tests
104104
pip install urllib3 ndg-httpsclient pyasn1 ecdsa python-slugify grpcio-tools jinja2 b3j0f.aop
105105

106106
cat >> ~/.bashrc <<HEREDOC

devenv/setupUbuntuOnPPC64le.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ apt-get -y install software-properties-common curl git sudo wget "build-essentia
4444
#####################################
4545
# Install and setup Docker services #
4646
#####################################
47-
# 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.
47+
# Along with docker.io, aufs-tools also needs to be installed as 'auplink' which is part of aufs-tools package
4848
apt-get -y install docker.io aufs-tools
4949

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

7171
################################################
72-
# Install PIP tools, behave and docker-compose #
72+
# Install PIP tools and docker-compose #
7373
################################################
7474

7575
apt-get -y install python-pip libssl-dev libffi-dev libltdl-dev
7676
pip install --upgrade pip
77-
pip install behave nose docker-compose
77+
pip install nose docker-compose
7878

7979
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
8080

81-
#PIP packages required for some behave tests
81+
#PIP packages required for some tests
8282
pip install urllib3 ndg-httpsclient pyasn1 ecdsa python-slugify grpcio-tools jinja2 b3j0f.aop six

docs/source/dev-setup/build.rst

+1-26
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,6 @@ client SDK is not broken by your changes. To run the Node.js unit tests,
4949
follow the instructions
5050
`here <https://github.com/hyperledger/fabric-sdk-node/blob/master/README.md>`__.
5151

52-
Running Behave BDD Tests
53-
~~~~~~~~~~~~~~~~~~~~~~~~
54-
55-
**Note:** currently, the behave tests must be run from within in the
56-
Vagrant environment. See the :doc:`development environment <devenv>` setup instructions
57-
if you have not already set up your Vagrant environment.
58-
59-
`Behave <https://pypi.python.org/pypi/behave>`__ tests will setup networks
60-
of peers with different security and consensus configurations and verify
61-
that transactions run properly. To run these tests
62-
63-
::
64-
65-
cd $GOPATH/src/github.com/hyperledger/fabric
66-
make behave
67-
68-
Some of the Behave tests run inside Docker containers. If a test fails
69-
and you want to have the logs from the Docker containers, run the tests
70-
with this option:
71-
72-
::
73-
74-
cd $GOPATH/src/github.com/hyperledger/fabric/bddtests
75-
behave -D logs=Y
76-
7752
Building outside of Vagrant
7853
---------------------------
7954

@@ -111,7 +86,7 @@ development environment.
11186
::
11287

11388
cd $GOPATH/src/github.com/hyperledger/fabric
114-
make peer unit-test behave
89+
make peer unit-test
11590

11691
Building on Power Platform
11792
~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/source/dev-setup/devenv.rst

+2-5
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,13 @@ Prerequisites
5555
- Note: The BIOS Enabled Virtualization may be within the CPU or
5656
Security settings of the BIOS
5757

58-
``pip`` and ``behave``
59-
~~~~~~~~~~~~~~~~~~~~~~
58+
``pip``
59+
~~~~~~
6060

6161
::
6262

6363
pip install --upgrade pip
6464

65-
#PIP packages required for some behave tests
66-
pip install -r devenv/bddtests-requirements.txt
67-
6865

6966
Steps
7067
~~~~~

docs/source/kafka.rst

-5
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,5 @@ Debugging
8383

8484
Set ``General.LogLevel`` to ``DEBUG`` and ``Kafka.Verbose`` in ``orderer.yaml`` to ``true``.
8585

86-
Example
87-
-------
88-
89-
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``.
90-
9186
.. Licensed under Creative Commons Attribution 4.0 International License
9287
https://creativecommons.org/licenses/by/4.0/

scripts/containerlogs.sh

-29
This file was deleted.

scripts/install_behave.sh

-42
This file was deleted.

0 commit comments

Comments
 (0)