Skip to content

Commit 45c24d9

Browse files
authored
Also run integration tests (#97)
* Also run integration tests * more rabbit junk * oof * logging * oof * use threading primitives
1 parent 904edea commit 45c24d9

File tree

3 files changed

+44
-2
lines changed

3 files changed

+44
-2
lines changed

.appveyor.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,43 @@ configuration: Release
99

1010
install:
1111
- choco install gitversion.portable -pre -y
12+
- choco install -y rabbitmq
13+
- ps: |
14+
write-host "Discovering rabbitmq installation location"
15+
$regPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ"
16+
if (Test-Path "HKLM:\SOFTWARE\Wow6432Node\") { $regPath = "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ" }
17+
$path = Split-Path -Parent (Get-ItemProperty $regPath "UninstallString").UninstallString
18+
$version = (Get-ItemProperty $regPath "DisplayVersion").DisplayVersion
19+
[Environment]::SetEnvironmentVariable("RABBITMQ_HOME", "$path\rabbitmq_server-$version", "Machine")
20+
$env:RABBITMQ_HOME = "$path\rabbitmq_server-$version"
21+
[Environment]::SetEnvironmentVariable("RABBITMQ_RABBITMQCTL_PATH", "$path\rabbitmq_server-$version\sbin\rabbitmqctl.bat", "Machine")
22+
23+
$env:RABBITMQ_RABBITMQCTL_PATH = "$path\rabbitmq_server-$version\sbin\rabbitmqctl.bat"
24+
$env:RABBITMQ_RABBITMQSERVER_PATH = "$path\rabbitmq_server-$version\sbin\rabbitmq-service.bat"
25+
26+
write-host $env:RABBITMQ_RABBITMQCTL_PATH
27+
write-host $env:RABBITMQ_RABBITMQSERVER_PATH
28+
29+
$uninstall = "cmd.exe /C '$env:RABBITMQ_RABBITMQSERVER_PATH' remove"
30+
$install = "cmd.exe /C '$env:RABBITMQ_RABBITMQSERVER_PATH' install"
31+
$start = "cmd.exe /C '$env:RABBITMQ_RABBITMQSERVER_PATH' start"
32+
33+
write-host "Removing rabbitmq"
34+
Invoke-Expression -Command:$uninstall
35+
Start-Sleep 2
36+
37+
write-host "Installing rabbitmq"
38+
Invoke-Expression -Command:$install
39+
Start-Sleep 2
40+
41+
write-host "Starting rabbitmq"
42+
Invoke-Expression -Command:$start
43+
Start-Sleep 2
44+
45+
before_build:
1246
- cmd: dotnet restore src\Chinchilla.sln
1347
- ps: gitversion /l console /output buildserver
1448

15-
1649
dotnet_csproj:
1750
patch: true
1851
file: 'src\**\*.csproj'

build/run-tests.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,12 @@ Get-ChildItem src\*.Specifications `
66
dotnet test "src\\$_" -c Release --no-build --logger trx --results-directory (Join-Path $(pwd) test_results)
77
$testExitCode += $LASTEXITCODE
88
}
9+
10+
Get-ChildItem src\*.Integration `
11+
| select -ExpandProperty Name `
12+
| % {
13+
dotnet test "src\\$_" -c Release --no-build --logger trx --results-directory (Join-Path $(pwd) test_results)
14+
$testExitCode += $LASTEXITCODE
15+
}
16+
917
if ($testExitCode -ne 0) { $host.SetShouldExit($testExitCode); throw; }

src/Chinchilla.Integration/Features/SubscribeFeature.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Linq;
3+
using System.Threading;
34
using Chinchilla.Api;
45
using Chinchilla.Integration.Features.Messages;
56
using Chinchilla.Integration.Features.MessageTypeFactories;
@@ -47,7 +48,7 @@ public void ShouldReceivedPublishedMessage()
4748
bus.Subscribe((HelloWorldMessage hwm) =>
4849
{
4950
lastReceived = hwm;
50-
++numReceived;
51+
Interlocked.Increment(ref numReceived);
5152
});
5253

5354
for (var i = 0; i < 100; ++i)

0 commit comments

Comments
 (0)