Adjust patches

MSP-Greg · Jan 26, 2020 · ed7fc20 · ed7fc20
1 parent db7847a
commit ed7fc20
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/old_patches/test/reline-test_reline.rb.patch b/old_patches/test/reline-test_reline.rb.patch
diff --git a/patches_test/net_openssl_ctx.rb.patch b/patches_test/net_openssl_ctx.rb.patch
@@ -124,7 +124,7 @@ index 2504a48d0a..24d43b7c90 100644
          sock.sync_close = true
          begin
 diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb
-index 17fabb62d5..fa0e3fa86a 100644
+index 204bfb7ad3..8140bd2b07 100644
 --- a/test/net/http/test_https.rb
 +++ b/test/net/http/test_https.rb
 @@ -4,23 +4,15 @@
@@ -163,7 +163,7 @@ index 17fabb62d5..fa0e3fa86a 100644
 
      http.start
 diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
-index 33b305e116..d6bc366a84 100644
+index 03692c233a..8159fedb66 100644
 --- a/test/net/imap/test_imap.rb
 +++ b/test/net/imap/test_imap.rb
 @@ -2,11 +2,10 @@
@@ -180,7 +180,7 @@ index 33b305e116..d6bc366a84 100644
 
    def setup
      @do_not_reverse_lookup = Socket.do_not_reverse_lookup
-@@ -708,14 +707,7 @@ def test_append_fail
+@@ -748,14 +747,7 @@ def test_append_fail
    def imaps_test
      server = create_tcp_server
      port = server.addr[1]
@@ -196,7 +196,7 @@ index 33b305e116..d6bc366a84 100644
      ssl_server = OpenSSL::SSL::SSLServer.new(server, ctx)
      started = false
      ths = Thread.start do
-@@ -757,14 +749,7 @@ def starttls_test
+@@ -797,14 +789,7 @@ def starttls_test
          sock.print("* OK test server\r\n")
          sock.gets
          sock.print("RUBY0001 OK completed\r\n")