Made the SSL tests run only if SSL_CERTS_DIR is defined, and it also does the right import into the trust store (certmgr).

Author: Matthew Sackman

configs/dotnet-1.1.build

@@ -3,4 +3,5 @@
   <property name="target.framework" value="net-1.1" />
   <property name="debug" value="true"/>
   <property name="python.exec" value="python.exe"/>
+  <property name="certmgr.exec" value="certmgr.exe"/>
 </project>

configs/dotnet-2.0.build

@@ -3,4 +3,5 @@
   <property name="target.framework" value="net-2.0" />
   <property name="debug" value="true"/>
   <property name="python.exec" value="python.exe"/>
+  <property name="certmgr.exec" value="certmgr.exe"/>
 </project>

configs/mono-1.0.build

@@ -4,4 +4,5 @@
   <property name="debug" value="true"/>
   <property name="msbuild" value="xbuild"/>
   <property name="python.exec" value="python"/>
+  <property name="certmgr.exec" value="certmgr"/>
 </project>

configs/mono-2.0.build

@@ -4,4 +4,5 @@
   <property name="debug" value="true"/>
   <property name="msbuild" value="xbuild"/>
   <property name="python.exec" value="python"/>
+  <property name="certmgr.exec" value="certmgr"/>
 </project>

default.build

@@ -305,8 +305,25 @@
     <copy file="${nunit.dllname}" todir="${bin.dir}"/>
   </target>
 
+  <target name="detect-ssl">
+    <property name="ssl.avail" value="false"/>
+    <property name="ssl.avail" value="true"
+      if="${environment::variable-exists('SSL_CERTS_DIR')}"/>
+    <property name="ssl.certs.dir" value="${environment::get-variable('SSL_CERTS_DIR')}"
+      if="${environment::variable-exists('SSL_CERTS_DIR')}"/>
+  </target>
+
+  <target name="import-ssl" description="import cacert into certmgr" depends="detect-ssl" if="${ssl.avail}">
+    <exec program="${certmgr.exec}">
+      <arg value="-add"/>
+      <arg value="-c"/>
+      <arg value="Trust"/>
+      <arg value="${ssl.certs.dir}/testca/cacert.cer"/>
+    </exec>
+  </target>
+
   <target name="unit" description="run unit tests"
-	      depends="build-unit">
+	      depends="build-unit,import-ssl">
     <exec program="src/unit/nunit/nunit-console.exe" useruntimeengine="true">
       <arg value="${unit-tests.dllname}"/>
     </exec>

src/unit/TestSslEndpointUnverified.cs

@@ -89,13 +89,18 @@ public void SendReceive(IConnection conn) {
 
     [Test]
     public void TestHostWithPort() {
-        ConnectionFactory cf = new ConnectionFactory();
+        string sslDir = Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
+        if (null == sslDir) {
+            return;
+        } else {
+            ConnectionFactory cf = new ConnectionFactory();
 
-        cf.Parameters.Ssl.ServerName = System.Net.Dns.GetHostName();
-        cf.Parameters.Ssl.Enabled = true;
+            cf.Parameters.Ssl.ServerName = System.Net.Dns.GetHostName();
+            cf.Parameters.Ssl.Enabled = true;
 
-        IProtocol proto = Protocols.DefaultProtocol;
-        IConnection conn = cf.CreateConnection(proto, "localhost", 5671);
-        SendReceive(conn);
+            IProtocol proto = Protocols.DefaultProtocol;
+            IConnection conn = cf.CreateConnection(proto, "localhost", 5671);
+            SendReceive(conn);
+        }
     }
 }

src/unit/TestSslEndpointVerified.cs

@@ -63,19 +63,23 @@ public class TestSslEndpointVerified: TestSslEndpointUnverified {
 
     [Test]
     public void TestHostWithPort() {
-        ConnectionFactory cf = new ConnectionFactory();
-
-        cf.Parameters.Ssl.ServerName = System.Net.Dns.GetHostName();
         string sslDir = Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
-        Assert.IsNotNull(sslDir);
-        cf.Parameters.Ssl.CertPath = sslDir + "/client/keycert.p12";
-        string p12Password = Environment.GetEnvironmentVariable("PASSWORD");
-        Assert.IsNotNull(p12Password);
-        cf.Parameters.Ssl.CertPassphrase = p12Password;
-        cf.Parameters.Ssl.Enabled = true;
+        if (null == sslDir) {
+            return;
+        } else {
+            ConnectionFactory cf = new ConnectionFactory();
+
+            cf.Parameters.Ssl.ServerName = System.Net.Dns.GetHostName();
+            Assert.IsNotNull(sslDir);
+            cf.Parameters.Ssl.CertPath = sslDir + "/client/keycert.p12";
+            string p12Password = Environment.GetEnvironmentVariable("PASSWORD");
+            Assert.IsNotNull(p12Password);
+            cf.Parameters.Ssl.CertPassphrase = p12Password;
+            cf.Parameters.Ssl.Enabled = true;
 
-        IProtocol proto = Protocols.DefaultProtocol;
-        IConnection conn = cf.CreateConnection(proto, "localhost", 5671);
-        SendReceive(conn);
+            IProtocol proto = Protocols.DefaultProtocol;
+            IConnection conn = cf.CreateConnection(proto, "localhost", 5671);
+            SendReceive(conn);
+        }
     }
 }