diff --git a/docs/tests/FILEFORMAT.md b/docs/tests/FILEFORMAT.md
index 31e0fbf463..f3121fd3c9 100644
--- a/docs/tests/FILEFORMAT.md
+++ b/docs/tests/FILEFORMAT.md
@@ -260,7 +260,7 @@ similar.
## ``
-### ``
+### ``
data to be sent to the client on its request and later verified that it
arrived safely. Set `nocheck="yes"` to prevent the test script from verifying
@@ -282,9 +282,6 @@ auth tests and similar.
`sendzero=yes` means that the (FTP) server "sends" the data even if the size
is zero bytes. Used to verify curl's behavior on zero bytes transfers.
-`hex=yes` means that the data is a sequence of hex pairs. It gets decoded and
-used as "raw" data.
-
`nonewline=yes` means that the last byte (the trailing newline character)
should be cut off from the data before sending or comparing it.
diff --git a/tests/data/test1132 b/tests/data/test1132
index 56d7e9214e..5ef2a371ca 100644
--- a/tests/data/test1132
+++ b/tests/data/test1132
@@ -12,9 +12,6 @@ MQTT CONNACK
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Remaining Length must be 2 in a CONNACK
diff --git a/tests/data/test1190 b/tests/data/test1190
index 902b650377..e5ab3dc65b 100644
--- a/tests/data/test1190
+++ b/tests/data/test1190
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test1192 b/tests/data/test1192
index ce3d80f77f..0865040b49 100644
--- a/tests/data/test1192
+++ b/tests/data/test1192
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test1194 b/tests/data/test1194
index 379b352ed8..36ccfd0f82 100644
--- a/tests/data/test1194
+++ b/tests/data/test1194
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
PUBLISH-before-SUBACK TRUE
diff --git a/tests/data/test1195 b/tests/data/test1195
index 41a91248ae..c80e1b7be2 100644
--- a/tests/data/test1195
+++ b/tests/data/test1195
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
PUBLISH-before-SUBACK TRUE
short-PUBLISH TRUE
diff --git a/tests/data/test1196 b/tests/data/test1196
index b712f7e0de..dc79141cb3 100644
--- a/tests/data/test1196
+++ b/tests/data/test1196
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# error 1 - "Connection Refused, unacceptable protocol version"
diff --git a/tests/data/test1198 b/tests/data/test1198
index e201910dab..0190938e96 100644
--- a/tests/data/test1198
+++ b/tests/data/test1198
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test1199 b/tests/data/test1199
index 5113f150d1..dbdd92ed01 100644
--- a/tests/data/test1199
+++ b/tests/data/test1199
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test1640 b/tests/data/test1640
index e6f1f59fb0..816ca83979 100644
--- a/tests/data/test1640
+++ b/tests/data/test1640
@@ -13,9 +13,6 @@ MQTTS
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test1916 b/tests/data/test1916
index 98bce5d311..0a56251d24 100644
--- a/tests/data/test1916
+++ b/tests/data/test1916
@@ -12,9 +12,6 @@ MQTT PUBLISH
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test1917 b/tests/data/test1917
index 2b4c6f2226..d1a79d2d9b 100644
--- a/tests/data/test1917
+++ b/tests/data/test1917
@@ -12,9 +12,6 @@ MQTT PUBLISH
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test2200 b/tests/data/test2200
index d1243433a1..95baca6bc0 100644
--- a/tests/data/test2200
+++ b/tests/data/test2200
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# error 5 - "Connection Refused, not authorized. Wrong data supplied"
diff --git a/tests/data/test2203 b/tests/data/test2203
index 8b4a699ebc..9d8c1da679 100644
--- a/tests/data/test2203
+++ b/tests/data/test2203
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# error 5 - "Connection Refused, not authorized. No user or password supplied"
diff --git a/tests/data/test2204 b/tests/data/test2204
index 11e8ce0fb6..fc1e480db1 100644
--- a/tests/data/test2204
+++ b/tests/data/test2204
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/data/test3017 b/tests/data/test3017
index 87362b98dc..5133c7b5a6 100644
--- a/tests/data/test3017
+++ b/tests/data/test3017
@@ -12,9 +12,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 33 30 31 37 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
excessive-remaining TRUE
diff --git a/tests/data/test3018 b/tests/data/test3018
index 5b33b98751..8602a7be47 100644
--- a/tests/data/test3018
+++ b/tests/data/test3018
@@ -13,9 +13,6 @@ MQTT SUBSCRIBE
hello
-
-00 04 33 30 31 38 68 65 6c 6c 6f 5b 4c 46 5d 0a
-
# Client-side
diff --git a/tests/getpart.pm b/tests/getpart.pm
index 3329b13a34..5fa4b1e62b 100644
--- a/tests/getpart.pm
+++ b/tests/getpart.pm
@@ -62,15 +62,6 @@ sub normalize_part {
return join("\t", @_);
}
-sub decode_hex {
- my $s = $_;
- # remove everything not hex
- $s =~ s/[^A-Fa-f0-9]//g;
- # encode everything
- $s =~ s/([a-fA-F0-9][a-fA-F0-9])/chr(hex($1))/eg;
- return $s;
-}
-
sub testcaseattr {
my %hash;
for(@xml) {
@@ -134,7 +125,6 @@ sub getpart {
my @this;
my $inside=0;
- my $hex=0;
my $line;
for(@xml) {
@@ -146,10 +136,6 @@ sub getpart {
if($inside > 1) {
push @this, $_;
}
- elsif($_ =~ /$part [^>]*hex=/) {
- # attempt to detect a hex-encoded part
- $hex=1;
- }
$inside++;
}
elsif(($inside >= 2) && ($_ =~ /^ *\<\/$part[ \>]/)) {
@@ -169,13 +155,6 @@ sub getpart {
if($warning && !@this) {
print STDERR "*** getpart.pm: $section/$part returned empty!\n";
}
- if($hex) {
- # decode the whole array before returning it!
- for(@this) {
- my $decoded = decode_hex($_);
- $_ = $decoded;
- }
- }
return @this;
}
elsif($inside >= 2) {