Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 3346151

Browse files
mortezagmortezag
committed
Merge pull request #323 from mortezag/fixHttpTests
Fix http tests issues
2 parents 34a92c3 + a4f5227 commit 3346151

13 files changed

+143
-121
lines changed

‎Test/Platform/Tests/CLR/System/Http/FunctionalTests.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@ private byte[] GetRequested(string uri, params string[] servers)
197197

198198
// Create request.
199199
HttpWebRequest request = HttpWebRequest.Create(uri) as HttpWebRequest;
200-
// Set proxy information
201-
WebProxy itgProxy = new WebProxy(HttpTests.Proxy, true);
202-
request.Proxy = itgProxy;
203200
// Get response from server.
204201
WebResponse resp = null;
205202
try

‎Test/Platform/Tests/CLR/System/Http/HttpKnownHeaderNamesTests.cs‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@ public class HttpKnownHeaderNamesTests : IMFTestInterface
1515
public InitializeResult Initialize()
1616
{
1717
Log.Comment("Adding set up for the tests.");
18-
// Add your functionality here.
18+
try
19+
{
20+
Microsoft.SPOT.Net.NetworkInformation.NetworkInterface[] nis = Microsoft.SPOT.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces();
21+
}
22+
catch
23+
{
24+
return InitializeResult.Skip;
25+
}
1926

2027
return InitializeResult.ReadyToGo;
2128
}
@@ -83,7 +90,7 @@ private bool VerifyHeaderIsLegal(WebHeaderCollection wrc, string header, string
8390
public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_1()
8491
{
8592
MFTestResults result = MFTestResults.Pass;
86-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
93+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
8794
wr.UserAgent = ".Net Micro Framwork Device/4.0";
8895

8996
Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
@@ -121,7 +128,7 @@ public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_1()
121128
public MFTestResults ValidateAbleToSetPropertiesValueHTTP1_1()
122129
{
123130
MFTestResults result = MFTestResults.Pass;
124-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
131+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
125132
wr.UserAgent = ".Net Micro Framwork Device/4.0";
126133

127134
Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
@@ -217,7 +224,7 @@ public MFTestResults ValidateAbleToSetPropertiesValueHTTP1_1()
217224
public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_0()
218225
{
219226
MFTestResults result = MFTestResults.Pass;
220-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
227+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
221228
wr.UserAgent = ".Net Micro Framwork Device/4.0";
222229

223230
Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
@@ -256,7 +263,7 @@ public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_0()
256263
public MFTestResults ValidateAbleToSetPropertiesValueHTTP1_0()
257264
{
258265
MFTestResults result = MFTestResults.Pass;
259-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
266+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
260267
wr.UserAgent = ".Net Micro Framwork Device/4.0";
261268

262269
Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1

‎Test/Platform/Tests/CLR/System/Http/HttpRequestHeaderTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private MFTestResults Verify(System.Net.WebHeaderCollection wrc, System.Net.WebH
8282
public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1()
8383
{
8484
MFTestResults result = MFTestResults.Pass;
85-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
85+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
8686
wr.UserAgent = ".Net Micro Framwork Device/4.0";
8787

8888
Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
@@ -166,7 +166,7 @@ public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1_Http
166166
public MFTestResults InValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1_Https()
167167
{
168168
MFTestResults result = MFTestResults.Pass;
169-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://127.0.0.1:443/");
169+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://"+ Utilities.GetLocalIpAddress() + ":443/");
170170
wr.UserAgent = ".Net Micro Framwork Device/4.0";
171171

172172
Log.Comment("Negative Test case 1:");
@@ -309,7 +309,7 @@ public MFTestResults InvalidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1()
309309
public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0()
310310
{
311311
MFTestResults result = MFTestResults.Pass;
312-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
312+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
313313
wr.UserAgent = ".Net Micro Framwork Device/4.0";
314314

315315
Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
@@ -351,7 +351,7 @@ public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0()
351351
public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0_HTTPS()
352352
{
353353
MFTestResults result = MFTestResults.Pass;
354-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://127.0.0.1:443/");
354+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://"+ Utilities.GetLocalIpAddress() + ":443/");
355355
wr.UserAgent = ".Net Micro Framwork Device/4.0";
356356

357357
Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
@@ -393,7 +393,7 @@ public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0_HTTP
393393
public MFTestResults InValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0_HTTPS()
394394
{
395395
MFTestResults result = MFTestResults.Pass;
396-
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://127.0.0.1:443/");
396+
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://"+ Utilities.GetLocalIpAddress() + ":443/");
397397
wr.UserAgent = ".Net Micro Framwork Device/4.0";
398398

399399
Log.Comment("Negative Test case 4:");

‎Test/Platform/Tests/CLR/System/Http/HttpServer.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public void StartServer()
6565
s_CurrentPort++;
6666
throw new Exception("StartServer failed");
6767
}
68+
69+
s_CurrentPort++;
6870
}
6971

7072

0 commit comments

Comments
 (0)