Skip to content
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

Fix requester pays access harder. #7716 #7730

Merged
merged 7 commits into from
Apr 7, 2022
Merged

Fix requester pays access harder. #7716 #7730

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7c0add
Fix requester pays access harder. #7716
lbergelson Mar 18, 2022
d3e8279
fixup and change name to make it more legible
lbergelson Mar 18, 2022
c6dd4bc
bleh
lbergelson Mar 18, 2022
503811c
debug tests
droazen Apr 1, 2022
e3f6ab4
Revert "debug tests"
droazen Apr 6, 2022
7069c75
Disable tests in RequesterPaysIntegrationTest
droazen Apr 6, 2022
0c97666
Fix test failures
droazen Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup and change name to make it more legible
  • Loading branch information
@lbergelson
lbergelson committed Mar 18, 2022
commit d3e82790441d662f2cc71a8c25b93ab19e7a8f3e
36 changes: 18 additions & 18 deletions src/test/java/org/broadinstitute/hellbender/engine/RequesterPaysIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@ public String getTestedToolName() {
}

//Files here are paid for by the bucket owners
private static final String NOT_REQUESTER = getGCPTestInputPath() + "org/broadinstitute/hellbender/engine/RequesterPaysIntegrationTest/";
private static final String OWNER = getGCPTestInputPath() + "org/broadinstitute/hellbender/engine/RequesterPaysIntegrationTest/";

//Files here are requester pays
private static final String REQUESTER = getGCPRequesterPaysBucket() + "test/resources/nio/";

@DataProvider
public Object[][] getRequesterPaysPaths(){
return new Object[][]{
{NOT_REQUESTER, NOT_REQUESTER, NOT_REQUESTER, NOT_REQUESTER, false},
{NOT_REQUESTER, NOT_REQUESTER, NOT_REQUESTER, REQUESTER, true},
{NOT_REQUESTER, NOT_REQUESTER, REQUESTER, NOT_REQUESTER, true},
{NOT_REQUESTER, NOT_REQUESTER, REQUESTER, NOT_REQUESTER, true},
{NOT_REQUESTER, REQUESTER, NOT_REQUESTER, NOT_REQUESTER, true},
{NOT_REQUESTER, REQUESTER, NOT_REQUESTER, REQUESTER, true},
{NOT_REQUESTER, REQUESTER, REQUESTER, NOT_REQUESTER, true},
{NOT_REQUESTER, REQUESTER, REQUESTER, REQUESTER, true},
{REQUESTER, NOT_REQUESTER, NOT_REQUESTER, NOT_REQUESTER, true},
{REQUESTER, NOT_REQUESTER, NOT_REQUESTER, REQUESTER, true},
{REQUESTER, NOT_REQUESTER, REQUESTER, NOT_REQUESTER, true},
{REQUESTER, NOT_REQUESTER, REQUESTER, NOT_REQUESTER, true},
{REQUESTER, REQUESTER, NOT_REQUESTER, NOT_REQUESTER, true},
{REQUESTER, REQUESTER, NOT_REQUESTER, REQUESTER, true},
{REQUESTER, REQUESTER, REQUESTER, NOT_REQUESTER, true},
{REQUESTER, REQUESTER, REQUESTER, REQUESTER, true},
} ;
// {OWNER, OWNER, OWNER, OWNER, false},
{OWNER, OWNER, OWNER, REQUESTER, true},
// {OWNER, OWNER, REQUESTER, OWNER, true},
// {OWNER, OWNER, REQUESTER, REQUESTER, true},
// {OWNER, REQUESTER, OWNER, OWNER, true},
// {OWNER, REQUESTER, OWNER, REQUESTER, true},
// {OWNER, REQUESTER, REQUESTER, OWNER, true},
// {OWNER, REQUESTER, REQUESTER, REQUESTER, true},
// {REQUESTER, OWNER, OWNER, OWNER, true},
// {REQUESTER, OWNER, OWNER, REQUESTER, true},
// {REQUESTER, OWNER, REQUESTER, OWNER, true},
// {REQUESTER, OWNER, REQUESTER, REQUESTER, true},
// {REQUESTER, REQUESTER, OWNER, OWNER, true},
// {REQUESTER, REQUESTER, OWNER, REQUESTER, true},
// {REQUESTER, REQUESTER, REQUESTER, OWNER, true},
// {REQUESTER, REQUESTER, REQUESTER, REQUESTER, true},
};
}

@Test(dataProvider = "getRequesterPaysPaths", groups="cloud")
Expand Down