[INDY-994] Logging tests sdk integration #559

ArtObr · 2018-03-06T06:06:41Z

This PR merged with INDY-1171. It would be better to apply it after 1171 will be merged with hyperledger/master

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1019

…erting Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1019

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1019

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1019

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…on/INDY-1172 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1172

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1172

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1019

…on/INDY-1019

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1171

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1171

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-994 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr · 2018-03-06T09:26:07Z

test this please

dsurnin · 2018-03-06T09:21:56Z

plenum/test/logging/test_logging_txn_state.py

 from plenum.test import waits
-from plenum.test.helper import ensureRejectsRecvd, sdk_send_random_and_check
-
+from plenum.test.helper import sdk_send_random_and_check, sdk_get_and_check_replies

 ERORR_MSG = "something went wrong"
 whitelist = [ERORR_MSG]


remove whitelist and ERROR_MSG if not used

dsurnin · 2018-03-06T09:31:20Z

plenum/test/logging/test_logging_txn_state.py


+import pytest
+
+from plenum.common.exceptions import RejectError


What is this?

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-994

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

* Additional checks for sdk_ functions Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Fix for exception handling and new function for "json to object" converting Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Space and the end Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Most of test integrated with txnPoolNodeSet Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * 3 test left to do Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * two tests left in INDY-1019. Others integrated Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Little fixes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Import resolve, TODO added Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * New line at the end Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * TODO for import added Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Unused looper import removed Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * One more test integrated with sdk Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Fixtures for prev test Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Unused import removed Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Start of integration Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Changes for test_different_request integration with sdk Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * helper changes commited Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * INDY-1172 done with chages at pool_transactions Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Code structure changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Additinal code structure changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Started sdk integration of tests Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Review fixes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * LibIndy versions update Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * temp Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * ha persist test done Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * more tests done Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * review fixes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * More tests done, some problems Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * more tests done Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * temp Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * more tests Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * all tests done, except one. need more of exception handling Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * exception handling made. One test strange behaviour left Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * tests done Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr added 30 commits February 7, 2018 12:28

Additional checks for sdk_ functions

b7bf039

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

7964748

…INDY-1019

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

e353bdc

…INDY-1019

Fix for exception handling and new function for "json to object" conv…

bac783f

…erting Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Space and the end

9194251

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Most of test integrated with txnPoolNodeSet

8e76fe3

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

5213476

…INDY-1019

3 test left to do

94ad1a2

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

2c5db03

…INDY-1019

two tests left in INDY-1019. Others integrated

1b897bf

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Little fixes

995fd31

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Import resolve, TODO added

b7bf226

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

1fc7959

…INDY-1019

New line at the end

c72f389

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

TODO for import added

4b1e35e

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Unused looper import removed

3a622e9

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

One more test integrated with sdk

54a0f92

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Fixtures for prev test

b77853a

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Unused import removed

edea820

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Start of integration

e69045d

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge branch 'indy-sdk-integration/INDY-1019' into indy-sdk-integrati…

c7434a6

…on/INDY-1172 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Changes for test_different_request integration with sdk

4a316a1

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

c521a5f

…INDY-1172

helper changes commited

c966fbb

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

1f33869

…INDY-1172

INDY-1172 done with chages at pool_transactions

dec5565

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

5e7e340

…INDY-1019

Merge branch 'indy-sdk-integration/INDY-1172' into indy-sdk-integrati…

29fe6ff

…on/INDY-1019

little fix

98475ad

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Code structure changes

4c9077b

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr added 11 commits February 26, 2018 20:54

more tests done

02b1587

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

ce9f2f7

…INDY-1171

review fixes

313ce5c

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

More tests done, some problems

26e182c

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

more tests done

c2fffbd

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

temp

e9ac26e

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

more tests

2ed932e

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

all tests done, except one. need more of exception handling

1571734

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

2cb174d

…INDY-1171

exception handling made. One test strange behaviour left

17f4535

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

tests done

ab27283

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr changed the title ~~[INDY-994] Logging tests sdk integration~~ [INDY-994] Logging tests sdk integration [skip ci] Mar 6, 2018

ArtObr added 3 commits March 6, 2018 12:11

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

3389d9c

…INDY-994 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

little fix

452120e

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

little fix

5c2aad9

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr changed the title ~~[INDY-994] Logging tests sdk integration [skip ci]~~ [INDY-994] Logging tests sdk integration Mar 6, 2018

dsurnin suggested changes Mar 6, 2018

View reviewed changes

ArtObr added 2 commits March 6, 2018 12:37

little fix

8d5fb5b

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

little fix

10ed5dd

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

dsurnin approved these changes Mar 6, 2018

View reviewed changes

ArtObr added 2 commits March 6, 2018 15:48

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

6ac1e69

…INDY-994

fix

9f26ea6

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

dsurnin approved these changes Mar 6, 2018

View reviewed changes

ashcherbakov approved these changes Mar 6, 2018

View reviewed changes

ashcherbakov merged commit a51f6bc into hyperledger:master Mar 6, 2018

ArtObr deleted the indy-sdk-integration/INDY-994 branch March 13, 2018 08:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[INDY-994] Logging tests sdk integration #559

[INDY-994] Logging tests sdk integration #559

ArtObr commented Mar 6, 2018

ArtObr commented Mar 6, 2018

dsurnin Mar 6, 2018

dsurnin Mar 6, 2018


		import pytest

		from plenum.common.exceptions import RejectError

[INDY-994] Logging tests sdk integration #559

[INDY-994] Logging tests sdk integration #559

Conversation

ArtObr commented Mar 6, 2018

ArtObr commented Mar 6, 2018

dsurnin Mar 6, 2018

Choose a reason for hiding this comment

dsurnin Mar 6, 2018

Choose a reason for hiding this comment