Merge pull request #40 from nickbabcock/update-ci

More reliable ci

OhmGraphite.Test/GraphiteTest.cs

@@ -14,10 +14,10 @@ namespace OhmGraphite.Test
             await writer.ReportMetrics(DateTime.Now, TestSensorCreator.Values());
 
             // wait for carbon to sync to disk
-            Thread.Sleep(TimeSpan.FromSeconds(1));
+            Thread.Sleep(TimeSpan.FromSeconds(4));
+
             var client = new HttpClient();
             var resp = await client.GetAsync("http://graphite/render?format=csv&target=ohm.my-pc.intelcpu.0.temperature.cpucore.1");
-            Assert.True(resp.IsSuccessStatusCode);
             var content = await resp.Content.ReadAsStringAsync();
             Assert.Contains("ohm.my-pc.intelcpu.0.temperature.cpucore.1", content);
         }
@@ -25,14 +25,17 @@ namespace OhmGraphite.Test
         [Fact, Trait("Category", "integration")]
         public async void InsertTagGraphiteTest()
         {
+            // Let the tag engine time to breathe
+            Thread.Sleep(TimeSpan.FromSeconds(2));
+
             var writer = new GraphiteWriter("graphite", 2003, "my-pc", tags: true);
             await writer.ReportMetrics(DateTime.Now, TestSensorCreator.Values());
 
             // wait for carbon to sync to disk
-            Thread.Sleep(TimeSpan.FromSeconds(2));
+            Thread.Sleep(TimeSpan.FromSeconds(4));
+
             var client = new HttpClient();
             var resp = await client.GetAsync("http://graphite/render?format=csv&target=seriesByTag('sensor_type=Temperature','hardware_type=CPU')");
-            Assert.True(resp.IsSuccessStatusCode);
             var content = await resp.Content.ReadAsStringAsync();
             Assert.Contains("host=my-pc", content);
             Assert.Contains("app=ohm", content);

OhmGraphite.Test/TimescaleTest.cs

@@ -12,7 +12,7 @@ namespace OhmGraphite.Test
             const string connStr = "Host=timescale;Username=postgres;Password=123456";
             var writer = new TimescaleWriter(connStr, true, "my-pc");
             var epoch = new DateTime(2001, 1, 13);
-            writer.ReportMetrics(epoch, TestSensorCreator.Values());
+            await writer.ReportMetrics(epoch, TestSensorCreator.Values());
             using (var conn = new NpgsqlConnection(connStr))
             {
                 conn.Open();
@@ -31,7 +31,7 @@ namespace OhmGraphite.Test
             const string connStr = "Host=timescale;Username=ohm;Password=itsohm;Database=timescale_built";
             var writer = new TimescaleWriter(connStr, false, "my-pc");
             var epoch = new DateTime(2001, 1, 13);
-            writer.ReportMetrics(epoch, TestSensorCreator.Values());
+            await writer.ReportMetrics(epoch, TestSensorCreator.Values());
             using (var conn = new NpgsqlConnection(selectStr))
             {
                 conn.Open();

ci/Dockerfile.timescale

@@ -1,3 +1,3 @@
-FROM timescale/timescaledb:0.12.1-pg10
+FROM timescale/timescaledb
 COPY ci/setup-docker.sh /docker-entrypoint-initdb.d/.
 COPY assets/schema.sql /sql/schema.sql

docker-compose.yml

@@ -25,4 +25,4 @@ services:
       - timescale
       - graphite
       - influx
-    command: ./ci/wait-for-it.sh timescale:5432 -- ./ci/wait-for-it.sh graphite:80 -- mono /root/.nuget/packages/xunit.runner.console/2.4.1/tools/net461/xunit.console.exe OhmGraphite.Test/bin/Debug/net461/OhmGraphite.Test.dll
+    command: ./ci/wait-for-it.sh timescale:5432 -- ./ci/wait-for-it.sh graphite:2003 -- ./ci/wait-for-it.sh graphite:8080 -- ./ci/wait-for-it.sh graphite:80 -- mono /root/.nuget/packages/xunit.runner.console/2.4.1/tools/net461/xunit.console.exe OhmGraphite.Test/bin/Debug/net461/OhmGraphite.Test.dll