You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2019/09/11 20:53:58 UTC
[thrift] branch master updated (8ff8abd -> 061eafb)
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git.
from 8ff8abd THRIFT-4957 testSanePartsOfCompactProtoTestStruct FAILED Client: Java Patch: Jens Geyer
new b7bd211 Prevent "Log file size too large" messages during CI tests
new 061eafb THRIFT-4955 Haskell test broken due to extension to CompactProtoTestStruct Client: Haskell Patch: Jens Geyer
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lib/java/test/org/apache/thrift/server/ServerTestBase.java | 6 +++++-
test/hs/DebugProtoTest_Main.hs | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
[thrift] 01/02: Prevent "Log file size too large" messages during
CI tests
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit b7bd211699095e55fa4d74a35b6c4244946b7f70
Author: Jens Geyer <je...@apache.org>
AuthorDate: Sat Mar 9 21:53:12 2019 +0100
Prevent "Log file size too large" messages during CI tests
---
lib/java/test/org/apache/thrift/server/ServerTestBase.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/java/test/org/apache/thrift/server/ServerTestBase.java b/lib/java/test/org/apache/thrift/server/ServerTestBase.java
index 1dee22d..8348cbc 100644
--- a/lib/java/test/org/apache/thrift/server/ServerTestBase.java
+++ b/lib/java/test/org/apache/thrift/server/ServerTestBase.java
@@ -94,9 +94,13 @@ public abstract class ServerTestBase extends TestCase {
public ByteBuffer testBinary(ByteBuffer thing) {
StringBuilder sb = new StringBuilder(thing.remaining() * 3);
thing.mark();
- while (thing.remaining() > 0) {
+ int limit = 0; // limit output to keep the log size sane
+ while ((thing.remaining() > 0) && (++limit < 1024)) {
sb.append(String.format("%02X ", thing.get()));
}
+ if(thing.remaining() > 0) {
+ sb.append("..."); // indicate we have more date
+ }
System.out.print("testBinary(" + sb.toString() + ")\n");
thing.reset();
return thing;
[thrift] 02/02: THRIFT-4955 Haskell test broken due to extension to
CompactProtoTestStruct Client: Haskell Patch: Jens Geyer
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit 061eafb1fa2aa83068305cf0eb768930253e8710
Author: Jens Geyer <je...@apache.org>
AuthorDate: Sat Mar 9 21:53:12 2019 +0100
THRIFT-4955 Haskell test broken due to extension to CompactProtoTestStruct
Client: Haskell
Patch: Jens Geyer
This closes #1872
---
test/hs/DebugProtoTest_Main.hs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/hs/DebugProtoTest_Main.hs b/test/hs/DebugProtoTest_Main.hs
index fb28963..97d4347 100644
--- a/test/hs/DebugProtoTest_Main.hs
+++ b/test/hs/DebugProtoTest_Main.hs
@@ -117,7 +117,11 @@ instance SIface.Srv_Iface InheritedHandler where
Types.compactProtoTestStruct_byte_map_map = Map.empty,
Types.compactProtoTestStruct_byte_set_map = Map.empty,
- Types.compactProtoTestStruct_byte_list_map = Map.empty }
+ Types.compactProtoTestStruct_byte_list_map = Map.empty,
+
+ Types.compactProtoTestStruct_field500 = 500,
+ Types.compactProtoTestStruct_field5000 = 5000,
+ Types.compactProtoTestStruct_field20000 = 20000 }
methodWithDefaultArgs _ arg = do
ThriftTestUtils.serverLog $ "Got methodWithDefaultArgs: " ++ show arg