From 5dda8ef31fa6e3fb536d8e168e878992532cceed Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 24 Jan 2017 14:02:26 -0400 Subject: [PATCH] Added environment var fallback --- test/Discord.Net.Tests/TestConfig.cs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/test/Discord.Net.Tests/TestConfig.cs b/test/Discord.Net.Tests/TestConfig.cs index 21c2dcb8d..bdab13ea7 100644 --- a/test/Discord.Net.Tests/TestConfig.cs +++ b/test/Discord.Net.Tests/TestConfig.cs @@ -1,5 +1,6 @@ using Newtonsoft.Json; using System.IO; +using System; namespace Discord { @@ -12,10 +13,21 @@ namespace Discord public static TestConfig LoadFile(string path) { - using (var stream = new FileStream(path, FileMode.Open)) - using (var reader = new StreamReader(stream)) - using (var jsonReader = new JsonTextReader(reader)) - return new JsonSerializer().Deserialize(jsonReader); + if (File.Exists(path)) + { + using (var stream = new FileStream(path, FileMode.Open)) + using (var reader = new StreamReader(stream)) + using (var jsonReader = new JsonTextReader(reader)) + return new JsonSerializer().Deserialize(jsonReader); + } + else + { + return new TestConfig() + { + Token = Environment.GetEnvironmentVariable("DNET_TEST_TOKEN"), + GuildId = ulong.Parse(Environment.GetEnvironmentVariable("DNET_TEST_GUILDID")) + }; + } } } } \ No newline at end of file