Skip to content

Commit b964075

Browse files
might be working :O
1 parent 0f13933 commit b964075

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

TransactionProcessor.IntegrationTests/Common/DockerHelper.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void SetupEventStoreContainer(String traceFolder)
5252
.WithName(this.EventStoreContainerName)
5353
.WithEnvironment("EVENTSTORE_RUN_PROJECTIONS=all", "EVENTSTORE_START_STANDARD_PROJECTIONS=true")
5454
.UseNetwork(this.TestNetwork)
55-
//.Mount(traceFolder, "/var/log/eventstore", MountType.ReadWrite)
55+
.Mount(traceFolder, "/var/log/eventstore", MountType.ReadWrite)
5656
.Build()
5757
.Start().WaitForPort("2113/tcp", 30000);
5858
}
@@ -84,16 +84,11 @@ public async Task StartContainersForScenarioRun(String scenarioName)
8484
this.TransactionProcessorPort = this.TransactionProcessorContainer.ToHostExposedEndpoint("5002/tcp").Port;
8585
this.EventStorePort = this.EventStoreContainer.ToHostExposedEndpoint("2113/tcp").Port;
8686

87-
Console.Out.WriteLine($"Started Estate Management on Port {this.EstateManagementPort}");
88-
Console.Out.WriteLine($"Started Txn Processor Management on Port {this.TransactionProcessorPort}");
89-
9087
// Setup the base address resolver
9188
Func<String, String> estateManagementBaseAddressResolver = api => $"http://127.0.0.1:{this.EstateManagementPort}";
9289
Func<String, String> transactionProcessorBaseAddressResolver = api => $"http://127.0.0.1:{this.TransactionProcessorPort}";
9390

94-
HttpClient httpClient = new HttpClient();
95-
//HttpClient httpClient2 = new HttpClient();
96-
this.EstateClient = new EstateClient(estateManagementBaseAddressResolver, httpClient);
91+
this.EstateClient = new EstateClient(estateManagementBaseAddressResolver, new HttpClient());
9792
this.TransactionProcessorClient = new TransactionProcessorClient(transactionProcessorBaseAddressResolver, new HttpClient());
9893

9994
// TODO: Use this to talk to txn processor until we have a client
@@ -153,11 +148,9 @@ private void SetupEstateManagementContainer(String traceFolder)
153148
.UseImage("stuartferguson/estatemanagement")
154149
.ExposePort(5000)
155150
.UseNetwork(new List<INetworkService> { this.TestNetwork, Setup.DatabaseServerNetwork }.ToArray())
156-
//.Mount(traceFolder, "/home", MountType.ReadWrite)
151+
.Mount(traceFolder, "/home", MountType.ReadWrite)
157152
.Build()
158153
.Start().WaitForPort("5000/tcp", 30000);
159-
160-
Console.Out.WriteLine("Started Estate Management");
161154
}
162155

163156
private void SetupTransactionProcessorContainer(String traceFolder)
@@ -173,7 +166,7 @@ private void SetupTransactionProcessorContainer(String traceFolder)
173166
.UseImage("transactionprocessor")
174167
.ExposePort(5002)
175168
.UseNetwork(new List<INetworkService> { this.TestNetwork, Setup.DatabaseServerNetwork }.ToArray())
176-
//.Mount(traceFolder, "/home", MountType.ReadWrite)
169+
.Mount(traceFolder, "/home", MountType.ReadWrite)
177170
.Build()
178171
.Start().WaitForPort("5002/tcp", 30000);
179172
}

TransactionProcessor.IntegrationTests/Common/GenericSteps.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ public async Task StartSystem()
4040
[AfterScenario]
4141
public async Task StopSystem()
4242
{
43-
Console.Out.WriteLine("In After Scenario");
44-
Console.Out.WriteLine(this.ScenarioContext.TestError != null);
45-
4643
if (this.ScenarioContext.TestError != null)
4744
{
4845
Exception currentEx = this.ScenarioContext.TestError;
@@ -69,10 +66,6 @@ public async Task StopSystem()
6966
}
7067
}
7168
}
72-
else
73-
{
74-
Console.Out.WriteLine("No Error :|");
75-
}
7669

7770
await this.TestingContext.DockerHelper.StopContainersForScenarioRun().ConfigureAwait(false);
7871
}

0 commit comments

Comments
 (0)