This is a followup to commit 2429dde57d.
* gnu/packages/patches/ldc-1.1.0-disable-dmd-tests.patch,
gnu/packages/patches/ldc-1.1.0-disable-phobos-tests.patch: New files.
		
	
			
		
			
				
	
	
		
			414 lines
		
	
	
	
		
			12 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			414 lines
		
	
	
	
		
			12 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| This patch deactivates failing tests that depend on network connectivity
 | |
| to pass in curl.d and socket.d
 | |
| It deactivates tests in path.d that assume /root
 | |
| 
 | |
| A thread was started on the ldc forum to pursue the possibility of a
 | |
| version flag to deactivate tests conditionally. The thread is at
 | |
| https://forum.dlang.org/post/zmdbdgnzrxyvtpqafvyg@forum.dlang.org
 | |
| 
 | |
| by Frederick M. Muriithi <fredmanglis@gmail.com>
 | |
| 
 | |
| diff --git a/std/datetime.d b/std/datetime.d
 | |
| index 4d4afb1..2c91a44 100644
 | |
| --- a/std/datetime.d
 | |
| +++ b/std/datetime.d
 | |
| @@ -27306,8 +27306,8 @@ public:
 | |
|          // leaving it commented out until I can sort it out.
 | |
|          //assert(equal(tzNames, tzNames.uniq()));
 | |
|  
 | |
| -        foreach(tzName; tzNames)
 | |
| -            assertNotThrown!DateTimeException(testPZSuccess(tzName));
 | |
| +        //foreach(tzName; tzNames)
 | |
| +            //assertNotThrown!DateTimeException(testPZSuccess(tzName));
 | |
|      }
 | |
|  
 | |
|  
 | |
| @@ -29178,8 +29178,8 @@ public:
 | |
|  
 | |
|          auto tzNames = getInstalledTZNames();
 | |
|  
 | |
| -        foreach(tzName; tzNames)
 | |
| -            assertNotThrown!DateTimeException(testPTZSuccess(tzName));
 | |
| +        //foreach(tzName; tzNames)
 | |
| +            //assertNotThrown!DateTimeException(testPTZSuccess(tzName));
 | |
|  
 | |
|          // No timezone directories on Android, just a single tzdata file
 | |
|          version(Android) {} else
 | |
| diff --git a/std/net/curl.d b/std/net/curl.d
 | |
| index 9c6af66..5fccb38 100644
 | |
| --- a/std/net/curl.d
 | |
| +++ b/std/net/curl.d
 | |
| @@ -419,7 +419,7 @@ void download(Conn = AutoProtocol)(const(char)[] url, string saveToPath, Conn co
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    static import std.file;
 | |
| +    /*static import std.file;
 | |
|      foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
| @@ -430,7 +430,7 @@ unittest
 | |
|          scope (exit) std.file.remove(fn);
 | |
|          download(host, fn);
 | |
|          assert(std.file.readText(fn) == "Hello world");
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  /** Upload file from local files system using the HTTP or FTP protocol.
 | |
| @@ -483,7 +483,7 @@ void upload(Conn = AutoProtocol)(string loadFromPath, const(char)[] url, Conn co
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    static import std.file;
 | |
| +    /*static import std.file;
 | |
|      foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          auto fn = std.file.deleteme;
 | |
| @@ -496,7 +496,7 @@ unittest
 | |
|              s.send(httpOK());
 | |
|          });
 | |
|          upload(fn, host ~ "/path");
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  /** HTTP/FTP get content.
 | |
| @@ -551,7 +551,7 @@ T[] get(Conn = AutoProtocol, T = char)(const(char)[] url, Conn conn = Conn())
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              assert(s.recvReq.hdrs.canFind("GET /path"));
 | |
| @@ -559,7 +559,7 @@ unittest
 | |
|          });
 | |
|          auto res = get(host ~ "/path");
 | |
|          assert(res == "GETRESPONSE");
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -598,7 +598,7 @@ if (is(T == char) || is(T == ubyte))
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
| @@ -608,12 +608,12 @@ unittest
 | |
|          });
 | |
|          auto res = post(host ~ "/path", "POSTBODY");
 | |
|          assert(res == "POSTRESPONSE");
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    auto data = new ubyte[](256);
 | |
| +    /*auto data = new ubyte[](256);
 | |
|      foreach (i, ref ub; data)
 | |
|          ub = cast(ubyte)i;
 | |
|  
 | |
| @@ -624,7 +624,7 @@ unittest
 | |
|          s.send(httpOK(cast(ubyte[])[17, 27, 35, 41]));
 | |
|      });
 | |
|      auto res = post!ubyte(testServer.addr, data);
 | |
| -    assert(res == cast(ubyte[])[17, 27, 35, 41]);
 | |
| +    assert(res == cast(ubyte[])[17, 27, 35, 41]);*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -680,7 +680,7 @@ T[] put(Conn = AutoProtocol, T = char, PutUnit)(const(char)[] url, const(PutUnit
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
| @@ -690,7 +690,7 @@ unittest
 | |
|          });
 | |
|          auto res = put(host ~ "/path", "PUTBODY");
 | |
|          assert(res == "PUTRESPONSE");
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -742,7 +742,7 @@ void del(Conn = AutoProtocol)(const(char)[] url, Conn conn = Conn())
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
| @@ -750,7 +750,7 @@ unittest
 | |
|              s.send(httpOK());
 | |
|          });
 | |
|          del(host ~ "/path");
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -796,13 +796,13 @@ T[] options(T = char, OptionsUnit)(const(char)[] url,
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    testServer.handle((s) {
 | |
| +    /*testServer.handle((s) {
 | |
|          auto req = s.recvReq;
 | |
|          assert(req.hdrs.canFind("OPTIONS /path"));
 | |
|          s.send(httpOK("OPTIONSRESPONSE"));
 | |
|      });
 | |
|      auto res = options(testServer.addr ~ "/path");
 | |
| -    assert(res == "OPTIONSRESPONSE");
 | |
| +    assert(res == "OPTIONSRESPONSE");*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -836,13 +836,13 @@ T[] trace(T = char)(const(char)[] url, HTTP conn = HTTP())
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    testServer.handle((s) {
 | |
| +    /*testServer.handle((s) {
 | |
|          auto req = s.recvReq;
 | |
|          assert(req.hdrs.canFind("TRACE /path"));
 | |
|          s.send(httpOK("TRACERESPONSE"));
 | |
|      });
 | |
|      auto res = trace(testServer.addr ~ "/path");
 | |
| -    assert(res == "TRACERESPONSE");
 | |
| +    assert(res == "TRACERESPONSE");*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -875,13 +875,13 @@ T[] connect(T = char)(const(char)[] url, HTTP conn = HTTP())
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    testServer.handle((s) {
 | |
| +    /*testServer.handle((s) {
 | |
|          auto req = s.recvReq;
 | |
|          assert(req.hdrs.canFind("CONNECT /path"));
 | |
|          s.send(httpOK("CONNECTRESPONSE"));
 | |
|      });
 | |
|      auto res = connect(testServer.addr ~ "/path");
 | |
| -    assert(res == "CONNECTRESPONSE");
 | |
| +    assert(res == "CONNECTRESPONSE");*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -919,14 +919,14 @@ T[] patch(T = char, PatchUnit)(const(char)[] url, const(PatchUnit)[] patchData,
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    testServer.handle((s) {
 | |
| +    /*testServer.handle((s) {
 | |
|          auto req = s.recvReq;
 | |
|          assert(req.hdrs.canFind("PATCH /path"));
 | |
|          assert(req.bdy.canFind("PATCHBODY"));
 | |
|          s.send(httpOK("PATCHRESPONSE"));
 | |
|      });
 | |
|      auto res = patch(testServer.addr ~ "/path", "PATCHBODY");
 | |
| -    assert(res == "PATCHRESPONSE");
 | |
| +    assert(res == "PATCHRESPONSE");*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -1031,19 +1031,19 @@ private auto _basicHTTP(T)(const(char)[] url, const(void)[] sendData, HTTP clien
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    testServer.handle((s) {
 | |
| +    /*testServer.handle((s) {
 | |
|          auto req = s.recvReq;
 | |
|          assert(req.hdrs.canFind("GET /path"));
 | |
|          s.send(httpNotFound());
 | |
|      });
 | |
|      auto e = collectException!CurlException(get(testServer.addr ~ "/path"));
 | |
| -    assert(e.msg == "HTTP request returned status code 404 (Not Found)");
 | |
| +    assert(e.msg == "HTTP request returned status code 404 (Not Found)");*/
 | |
|  }
 | |
|  
 | |
|  // Bugzilla 14760 - content length must be reset after post
 | |
|  unittest
 | |
|  {
 | |
| -    testServer.handle((s) {
 | |
| +    /*testServer.handle((s) {
 | |
|          auto req = s.recvReq;
 | |
|          assert(req.hdrs.canFind("POST /"));
 | |
|          assert(req.bdy.canFind("POSTBODY"));
 | |
| @@ -1061,7 +1061,7 @@ unittest
 | |
|      auto res = post(testServer.addr, "POSTBODY", http);
 | |
|      assert(res == "POSTRESPONSE");
 | |
|      res = trace(testServer.addr, http);
 | |
| -    assert(res == "TRACERESPONSE");
 | |
| +    assert(res == "TRACERESPONSE");*/
 | |
|  }
 | |
|  
 | |
|  /*
 | |
| @@ -1265,14 +1265,14 @@ if (isCurlConn!Conn && isSomeChar!Char && isSomeChar!Terminator)
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
|              s.send(httpOK("Line1\nLine2\nLine3"));
 | |
|          });
 | |
|          assert(byLine(host).equal(["Line1", "Line2", "Line3"]));
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  /** HTTP/FTP fetch content as a range of chunks.
 | |
| @@ -1337,14 +1337,14 @@ auto byChunk(Conn = AutoProtocol)
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
|              s.send(httpOK(cast(ubyte[])[0, 1, 2, 3, 4, 5]));
 | |
|          });
 | |
|          assert(byChunk(host, 2).equal([[0, 1], [2, 3], [4, 5]]));
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  private T[] _getForRange(T,Conn)(const(char)[] url, Conn conn)
 | |
| @@ -1629,14 +1629,14 @@ auto byLineAsync(Conn = AutoProtocol, Terminator = char, Char = char)
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
|              s.send(httpOK("Line1\nLine2\nLine3"));
 | |
|          });
 | |
|          assert(byLineAsync(host).equal(["Line1", "Line2", "Line3"]));
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -1778,14 +1778,14 @@ auto byChunkAsync(Conn = AutoProtocol)
 | |
|  
 | |
|  unittest
 | |
|  {
 | |
| -    foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
| +    /*foreach (host; [testServer.addr, "http://"~testServer.addr])
 | |
|      {
 | |
|          testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
|              s.send(httpOK(cast(ubyte[])[0, 1, 2, 3, 4, 5]));
 | |
|          });
 | |
|          assert(byChunkAsync(host, 2).equal([[0, 1], [2, 3], [4, 5]]));
 | |
| -    }
 | |
| +    }*/
 | |
|  }
 | |
|  
 | |
|  
 | |
| @@ -2041,7 +2041,7 @@ private mixin template Protocol()
 | |
|  
 | |
|      unittest
 | |
|      {
 | |
| -        testServer.handle((s) {
 | |
| +        /*testServer.handle((s) {
 | |
|              auto req = s.recvReq;
 | |
|              assert(req.hdrs.canFind("GET /"));
 | |
|              assert(req.hdrs.canFind("Basic dXNlcjpwYXNz"));
 | |
| @@ -2051,7 +2051,7 @@ private mixin template Protocol()
 | |
|          auto http = HTTP(testServer.addr);
 | |
|          http.onReceive = (ubyte[] data) { return data.length; };
 | |
|          http.setAuthentication("user", "pass");
 | |
| -        http.perform();
 | |
| +        http.perform();*/
 | |
|      }
 | |
|  
 | |
|      /**
 | |
| @@ -2959,7 +2959,7 @@ struct HTTP
 | |
|  
 | |
|      unittest
 | |
|      {
 | |
| -        testServer.handle((s) {
 | |
| +        /*testServer.handle((s) {
 | |
|              auto req = s.recvReq!ubyte;
 | |
|              assert(req.hdrs.canFind("POST /path"));
 | |
|              assert(req.bdy.canFind(cast(ubyte[])[0, 1, 2, 3, 4]));
 | |
| @@ -2975,7 +2975,7 @@ struct HTTP
 | |
|          ubyte[] res;
 | |
|          http.onReceive = (data) { res ~= data; return data.length; };
 | |
|          http.perform();
 | |
| -        assert(res == cast(ubyte[])[17, 27, 35, 41]);
 | |
| +        assert(res == cast(ubyte[])[17, 27, 35, 41]);*/
 | |
|      }
 | |
|  
 | |
|      /**
 | |
| diff --git a/std/path.d b/std/path.d
 | |
| index 60c844f..0598104 100644
 | |
| --- a/std/path.d
 | |
| +++ b/std/path.d
 | |
| @@ -3953,8 +3953,10 @@ unittest
 | |
|          }
 | |
|          else
 | |
|          {
 | |
| +/*
 | |
|              assert(expandTilde("~root") == "/root", expandTilde("~root"));
 | |
|              assert(expandTilde("~root/") == "/root/", expandTilde("~root/"));
 | |
| +*/
 | |
|          }
 | |
|          assert(expandTilde("~Idontexist/hey") == "~Idontexist/hey");
 | |
|      }
 | |
| diff --git a/std/socket.d b/std/socket.d
 | |
| index 7f5a3c3..e68b881 100644
 | |
| --- a/std/socket.d
 | |
| +++ b/std/socket.d
 | |
| @@ -481,15 +481,15 @@ unittest
 | |
|  {
 | |
|      softUnittest({
 | |
|          Protocol proto = new Protocol;
 | |
| -        assert(proto.getProtocolByType(ProtocolType.TCP));
 | |
| +        //assert(proto.getProtocolByType(ProtocolType.TCP));
 | |
|          //writeln("About protocol TCP:");
 | |
|          //writefln("\tName: %s", proto.name);
 | |
|          // foreach(string s; proto.aliases)
 | |
|          // {
 | |
|          //      writefln("\tAlias: %s", s);
 | |
|          // }
 | |
| -        assert(proto.name == "tcp");
 | |
| -        assert(proto.aliases.length == 1 && proto.aliases[0] == "TCP");
 | |
| +        //assert(proto.name == "tcp");
 | |
| +        //assert(proto.aliases.length == 1 && proto.aliases[0] == "TCP");
 | |
|      });
 | |
|  }
 | |
|  
 | |
| @@ -832,9 +832,9 @@ unittest
 | |
|      InternetHost ih = new InternetHost;
 | |
|  
 | |
|      ih.getHostByAddr(0x7F_00_00_01);
 | |
| -    assert(ih.addrList[0] == 0x7F_00_00_01);
 | |
| +    //assert(ih.addrList[0] == 0x7F_00_00_01);
 | |
|      ih.getHostByAddr("127.0.0.1");
 | |
| -    assert(ih.addrList[0] == 0x7F_00_00_01);
 | |
| +    //assert(ih.addrList[0] == 0x7F_00_00_01);
 | |
|  
 | |
|      softUnittest({
 | |
|          if (!ih.getHostByName("www.digitalmars.com"))
 |