Merge pull request hyperledger-archives#1923 from jeffgarratt/issues/…

…961/RBAC-Tcerts-NoAttrs Issues/961/rbac tcerts no attrs
lhaskins · Jun 20, 2016 · f39a9c5 · f39a9c5
2 parents bc7d987 + 6b272d7
commit f39a9c5
Show file tree

Hide file tree

Showing 35 changed files with 8,664 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,11 @@ tags
 .#*
 # bddtest log files
 *.log
+# bddtest coverage files
+bddtests/coverage
+*.cov
+# Makefile dummy artifacts
+.*-dummy
 # go-carpet output files
 go-carpet-coverage*
 # make node-sdk copied files

diff --git a/Makefile b/Makefile
@@ -80,7 +80,15 @@ unit-test: peer-image gotools
 .PHONY: images
 images: $(patsubst %,build/image/%/.dummy, $(IMAGES))
 
-behave-deps: images peer
+build/behave/.grpc-dummy:
+	sudo pip install -q 'grpcio==0.13.1'
+	mkdir -p build/behave
+	touch build/behave/.grpc-dummy
+
+behave-grpc: build/behave/.grpc-dummy
+
+
+behave-deps: images peer behave-grpc
 behave: behave-deps
 	@echo "Running behave tests"
 	@cd bddtests; behave $(BEHAVE_OPTS)

diff --git a/bddtests/.behaverc b/bddtests/.behaverc
@@ -4,3 +4,7 @@ tags=~@issue_724
 			~@issueUtxo
 			~@issue_477
 			~@issue_680
+			~@issue_1207
+			~@issue_1565
+			~@issue_RBAC_TCERT_With_Attributes
+			~@sdk
diff --git a/bddtests/api_pb2.py b/bddtests/api_pb2.py