Adjust timeouts for recent Travis build failures.

bgrainger · bgrainger · commit 39f800b2ffca · 2017-05-10T22:28:56.000-07:00
Related to #246.
diff --git a/tests/SideBySide/AppConfig.cs b/tests/SideBySide/AppConfig.cs
@@ -65,9 +65,8 @@ public static MySqlConnectionStringBuilder CreateConnectionStringBuilder()
 			return new MySqlConnectionStringBuilder(ConnectionString);
 		}
 
-		// tests can run extremely slowly on Appveyor (and slightly slower under Travis)
-		public static int TimeoutDelayFactor { get; } = Environment.GetEnvironmentVariable("APPVEYOR") == "True" ? 6 :
-			Environment.GetEnvironmentVariable("TRAVIS") == "true" ? 3 : 1;
+		// tests can run much slower in CI environments
+		public static int TimeoutDelayFactor { get; } = (Environment.GetEnvironmentVariable("APPVEYOR") == "True" || Environment.GetEnvironmentVariable("TRAVIS") == "true") ? 6 : 1;
 
 		private static string GetCodeRootPath()
 		{

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,8 @@ public static MySqlConnectionStringBuilder CreateConnectionStringBuilder()`
`65`	`65`	`return new MySqlConnectionStringBuilder(ConnectionString);`
`66`	`66`	`}`
`67`	`67`
`68`		`- // tests can run extremely slowly on Appveyor (and slightly slower under Travis)`
`69`		`- public static int TimeoutDelayFactor { get; } = Environment.GetEnvironmentVariable("APPVEYOR") == "True" ? 6 :`
`70`		`- Environment.GetEnvironmentVariable("TRAVIS") == "true" ? 3 : 1;`
	`68`	`+ // tests can run much slower in CI environments`
	`69`	`+ public static int TimeoutDelayFactor { get; } = (Environment.GetEnvironmentVariable("APPVEYOR") == "True" \|\| Environment.GetEnvironmentVariable("TRAVIS") == "true") ? 6 : 1;`
`71`	`70`
`72`	`71`	`private static string GetCodeRootPath()`
`73`	`72`	`{`