Skip to content

Commit

Permalink
use t.Name for safer test dirs
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukechampine
lukechampine committed Mar 3, 2017
1 parent 517b4cc commit 02371cc
Show file tree
Hide file tree
Showing 73 changed files with 441 additions and 449 deletions.
4 changes: 2 additions & 2 deletions api/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func TestApiClient(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestApiClient")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -34,7 +34,7 @@ func TestAuthenticatedApiClient(t *testing.T) {
}
t.Parallel()
testpass := "testPassword"
st, err := createAuthenticatedServerTester("TestAuthenticatedApiClient", testpass)
st, err := createAuthenticatedServerTester(t.Name(), testpass)
if err != nil {
t.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions api/consensus_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func TestIntegrationConsensusGET(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestIntegrationConsensusGET")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -44,7 +44,7 @@ func TestConsensusValidateTransactionSet(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestConsensusValidateTransactionSet")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down
14 changes: 7 additions & 7 deletions api/ecosystem_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,31 +268,31 @@ func TestHostPoorConnectivity(t *testing.T) {

// Create the various nodes that will be forming the simulated ecosystem of
// this test.
stLeader, err := createServerTester("TestHostPoorConnectivity - Leader")
stLeader, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
stHost1, err := blankServerTester("TestHostPoorConnectivity - Host 1")
stHost1, err := blankServerTester(t.Name() + " - Host 1")
if err != nil {
t.Fatal(err)
}
stHost2, err := blankServerTester("TestHostPoorConnectivity - Host 2")
stHost2, err := blankServerTester(t.Name() + " - Host 2")
if err != nil {
t.Fatal(err)
}
stHost3, err := blankServerTester("TestHostPoorConnectivity - Host 3")
stHost3, err := blankServerTester(t.Name() + " - Host 3")
if err != nil {
t.Fatal(err)
}
stHost4, err := blankServerTester("TestHostPoorConnectivity - Host 4")
stHost4, err := blankServerTester(t.Name() + " - Host 4")
if err != nil {
t.Fatal(err)
}
stRenter1, err := blankServerTester("TestHostPoorConnectivity - Renter 1")
stRenter1, err := blankServerTester(t.Name() + " - Renter 1")
if err != nil {
t.Fatal(err)
}
stRenter2, err := blankServerTester("TestHostPoorConnectivity - Renter 2")
stRenter2, err := blankServerTester(t.Name() + " - Renter 2")
if err != nil {
t.Fatal(err)
}
Expand Down
6 changes: 3 additions & 3 deletions api/explorer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func TestIntegrationExplorerGET(t *testing.T) {
if testing.Short() {
t.SkipNow()
}
st, err := createServerTester("TestIntegrationExplorerGET")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -37,7 +37,7 @@ func TestIntegrationExplorerBlockGET(t *testing.T) {
if testing.Short() {
t.SkipNow()
}
st, err := createServerTester("TestIntegrationExplorerBlockGET")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -62,7 +62,7 @@ func TestIntegrationExplorerHashGet(t *testing.T) {
if testing.Short() {
t.SkipNow()
}
st, err := createServerTester("TestIntegrationExplorerHashGET")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down
10 changes: 5 additions & 5 deletions api/gateway_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func TestGatewayStatus(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestGatewayStatus")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -34,13 +34,13 @@ func TestGatewayPeerConnect(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestGatewayPeerConnect1")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
defer st.server.Close()

peer, err := gateway.New("localhost:0", false, build.TempDir("api", "TestGatewayPeerConnect2", "gateway"))
peer, err := gateway.New("localhost:0", false, build.TempDir("api", t.Name(), "gateway"))
if err != nil {
t.Fatal(err)
}
Expand All @@ -66,13 +66,13 @@ func TestGatewayPeerDisconnect(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestGatewayPeerDisconnect1")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
defer st.server.Close()

peer, err := gateway.New("localhost:0", false, build.TempDir("api", "TestGatewayPeerDisconnect2", "gateway"))
peer, err := gateway.New("localhost:0", false, build.TempDir("api", t.Name()+"2", "gateway"))
if err != nil {
t.Fatal(err)
}
Expand Down
26 changes: 13 additions & 13 deletions api/host_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func TestStorageHandler(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestStorageHandler")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -121,7 +121,7 @@ func TestAddFolderNoPath(t *testing.T) {
t.Skip()
}
t.Parallel()
st, err := createServerTester("TestAddFolderNoPath")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -150,7 +150,7 @@ func TestAddFolderNoSize(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestAddFolderNoSize")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -172,7 +172,7 @@ func TestAddSameFolderTwice(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestAddSameFolderTwice")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -199,7 +199,7 @@ func TestResizeEmptyStorageFolder(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestResizeEmptyStorageFolder")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -281,7 +281,7 @@ func TestResizeNonemptyStorageFolder(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestResizeNonemptyStorageFolder")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -394,7 +394,7 @@ func TestResizeNonexistentFolder(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestResizeNonexistentFolder")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -418,7 +418,7 @@ func TestResizeFolderNoPath(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestResizeFolderNoPath")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -440,7 +440,7 @@ func TestRemoveEmptyStorageFolder(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestRemoveEmptyStorageFolder")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand All @@ -466,7 +466,7 @@ func TestRemoveStorageFolderError(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestRemoveStorageFolderErr")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -501,7 +501,7 @@ func TestRemoveStorageFolderForced(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestRemoveStorageFolderForced")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -572,7 +572,7 @@ func TestDeleteSector(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestDeleteSector")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -640,7 +640,7 @@ func TestDeleteNonexistentSector(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestDeleteNonexistentSector")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down
26 changes: 13 additions & 13 deletions api/hostdb_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestHostDBHostsActiveHandler(t *testing.T) {
if testing.Short() {
t.SkipNow()
}
st, err := createServerTester("TestHostDBHostsActiveHandler")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestHostDBHostsAllHandler(t *testing.T) {
if testing.Short() {
t.SkipNow()
}
st, err := createServerTester("TestHostDBHostsAllHandler")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -147,7 +147,7 @@ func TestHostDBHostsHandler(t *testing.T) {
if testing.Short() {
t.SkipNow()
}
st, err := createServerTester("TestHostDBHostsHandler")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -318,11 +318,11 @@ func TestHostDBScanOnlineOffline(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestHostDBScanOnlineOffline")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
stHost, err := blankServerTester("TestHostDBScanOnlineAndOffline-Host")
stHost, err := blankServerTester(t.Name() + "-Host")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -418,11 +418,11 @@ func TestHostDBAndRenterDownloadDynamicIPs(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestHostDBAndRenterDownloadDynamicIPs")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
stHost, err := blankServerTester("TestHostDBAndRenterDownloadDynamicIPs-Host")
stHost, err := blankServerTester(t.Name() + "-Host")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -636,11 +636,11 @@ func TestHostDBAndRenterUploadDynamicIPs(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestHostDBAndRenterUploadDynamicIPs")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
stHost, err := blankServerTester("TestHostDBAndRenterUploadDynamicIPs-Host")
stHost, err := blankServerTester(t.Name() + "-Host")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -885,11 +885,11 @@ func TestHostDBAndRenterFormDynamicIPs(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestHostDBAndRenterFormDynamicIPs")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
stHost, err := blankServerTester("TestHostDBAndRenterFormDynamicIPs-Host")
stHost, err := blankServerTester(t.Name() + "-Host")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -1089,11 +1089,11 @@ func TestHostDBAndRenterRenewDynamicIPs(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestHostDBAndRenterRenewDynamicIPs")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
stHost, err := blankServerTester("TestHostDBAndRenterRenewDynamicIPs-Host")
stHost, err := blankServerTester(t.Name() + "-Host")
if err != nil {
t.Fatal(err)
}
Expand Down
6 changes: 3 additions & 3 deletions api/miner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestMinerGET(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestMinerGET")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -51,7 +51,7 @@ func TestMinerStartStop(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestMinerStartStop")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -105,7 +105,7 @@ func TestMinerHeader(t *testing.T) {
t.SkipNow()
}
t.Parallel()
st, err := createServerTester("TestMinerHeader")
st, err := createServerTester(t.Name())
if err != nil {
t.Fatal(err)
}
Expand Down
Loading

0 comments on commit 02371cc

Please sign in to comment.