Skip to content

Merge bitcoin#9956: Reorganise qa directory #2912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
UdjinM6 merged 6 commits into from
May 19, 2019
Merged

Merge bitcoin#9956: Reorganise qa directory #2912

UdjinM6 merged 6 commits into from
May 19, 2019

Conversation

@PastaPastaPasta
Copy link
Member

@PastaPastaPasta PastaPastaPasta commented May 10, 2019

63d66ba Move src/test/bitcoin-util-test.py to test/util/bitcoin-util-test.py (John Newbery)
5b0bff4 Rename --enable-extended-rpc-tests to --enable-extended-functional-tests (John Newbery)
a9bd622 Rename test/pull-tester/rpc-tests.py to test/functional/test_runner.py (John Newbery)
c28ee91 Rename rpc-tests directory to functional (John Newbery)
00902c4 Rename qa directory to test (John Newbery)

Tree-SHA512: ee7125c0c647d81590177beef2c8852c4ef76fdcf888096d9d4d360562a01d8d3b453345c3040487b2a043935bd1e7e80018f34462d6e02262bedbe23edcc576

@UdjinM6 UdjinM6 added this to the 14.1 milestone May 10, 2019
@UdjinM6
Copy link

UdjinM6 commented May 15, 2019

No rule to make target 'test/util/data/txcreatemultisig3.hex' - probably the same issue as #2763 (comment)

@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented May 15, 2019

probably resolved

@UdjinM6
Copy link

UdjinM6 commented May 15, 2019

./ci/test_integrationtests.sh: line 20: ./qa/pull-tester/rpc-tests.py: No such file or directory
https://travis-ci.org/dashpay/dash/jobs/532912529#L3446

@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented May 15, 2019

Building w/o error, (except linux for some reason)
Squashing

@UdjinM6
Copy link

UdjinM6 commented May 15, 2019

Should also move a bunch of dash-specific tests https://github.com/dashpay/dash/tree/cc3915822d501ddfd109340fc4f482e494c589b1/qa/rpc-tests

UdjinM6
UdjinM6 reviewed May 15, 2019
View reviewed changes
UdjinM6
UdjinM6 reviewed May 15, 2019
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some permissions are broken 100755 → 100644 + see below

UdjinM6
UdjinM6 reviewed May 15, 2019
View reviewed changes
@UdjinM6 UdjinM6 mentioned this pull request May 15, 2019
Merged
@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented May 16, 2019

building locally, you can squash on merge

UdjinM6
UdjinM6 reviewed May 16, 2019
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls force push the latest commit to re-trigger travis again

@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented May 16, 2019

force pushed

UdjinM6
UdjinM6 previously approved these changes May 16, 2019
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK to merge after #2763

codablock
codablock previously approved these changes May 17, 2019
View reviewed changes
Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6
Copy link

UdjinM6 commented May 17, 2019

needs rebase

@codablock codablock mentioned this pull request May 17, 2019
Merged
MarcoFalke and others added 6 commits May 17, 2019 09:55
@PastaPastaPasta
Merge bitcoin#9956: Reorganise qa directory
ec0772f 
63d66ba Move src/test/bitcoin-util-test.py to test/util/bitcoin-util-test.py (John Newbery)
5b0bff4 Rename --enable-extended-rpc-tests to --enable-extended-functional-tests (John Newbery)
a9bd622 Rename test/pull-tester/rpc-tests.py to test/functional/test_runner.py (John Newbery)
c28ee91 Rename rpc-tests directory to functional (John Newbery)
00902c4 Rename qa directory to test (John Newbery)

Tree-SHA512: ee7125c0c647d81590177beef2c8852c4ef76fdcf888096d9d4d360562a01d8d3b453345c3040487b2a043935bd1e7e80018f34462d6e02262bedbe23edcc576

resolve build errors

Signed-off-by: Pasta <Pasta@dash.org>

update test_runner.py in testintegrations.sh

Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta
moved dash specific tests
cb9457d 
Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta
dashify README.md
081e325 
Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta
removed autoix*.py
07557b3 
Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta
change back file perms
013cf49
@PastaPastaPasta
dedashify
e5df430 
Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented May 17, 2019 •
edited
Loading

rebased @codablock @UdjinM6

@PastaPastaPasta PastaPastaPasta dismissed stale reviews from codablock and UdjinM6 via e5df430 May 17, 2019 14:55
UdjinM6
UdjinM6 approved these changes May 17, 2019
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
utACK

codablock
codablock approved these changes May 19, 2019
View reviewed changes
Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit 6edbc9c into dashpay:develop May 19, 2019
@PastaPastaPasta PastaPastaPasta deleted the backports-9956 branch May 20, 2019 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

+1 more reviewer

@codablock codablock codablock approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

15

Development

Successfully merging this pull request may close these issues.

3 participants

@PastaPastaPasta @UdjinM6 @codablock