diff --git a/tests/gating/main.fmf b/tests/gating/main.fmf new file mode 100644 index 0000000..79c226e --- /dev/null +++ b/tests/gating/main.fmf @@ -0,0 +1,3 @@ +summary: Concise summary describing what the test does +test: ./runtest.sh +framework: beakerlib diff --git a/tests/gating/runtest.sh b/tests/gating/runtest.sh new file mode 100755 index 0000000..ac34904 --- /dev/null +++ b/tests/gating/runtest.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlPhaseEnd + + rlPhaseStartTest + rlServiceStart "memcached" + rlRun "systemctl status memcached" 0 "verify that memcached is running" + rlPhaseEnd + + rlPhaseStartCleanup + rlServiceRestore memcached + rlPhaseEnd +rlJournalEnd diff --git a/tests/upstream-testsuite/Makefile b/tests/upstream-testsuite/Makefile deleted file mode 100644 index 3e4971d..0000000 --- a/tests/upstream-testsuite/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/memcached/Sanity/upstream-testsuite -# Description: Test for BZ#1613690 (rebase memcached to 1.5.9) -# Author: Ondrej Mejzlik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2019 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/memcached/Sanity/upstream-testsuite -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) no-abort.patch certs.patch wait-times.patch runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Ondrej Mejzlik " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1613690 (rebase memcached to 1.5.9)" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 130m" >> $(METADATA) - @echo "RunFor: memcached" >> $(METADATA) - @echo "Requires: autoconf gcc cyrus-sasl-md5 cyrus-sasl-plain cyrus-sasl-devel perl-generators perl-Test-Harness perl-Test-Simple automake memcached rpm-build libevent-devel openssl-devel selinux-policy-devel" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1613690" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/upstream-testsuite/PURPOSE b/tests/upstream-testsuite/PURPOSE deleted file mode 100644 index bac46bf..0000000 --- a/tests/upstream-testsuite/PURPOSE +++ /dev/null @@ -1,7 +0,0 @@ -PURPOSE of /CoreOS/memcached/Sanity/upstream-testsuite -Description: Runs upstrem testsuite from src.rpm -Author: Ondrej Mejzlik -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1613690 - -The testsuite is not run during package build by devel since it is CPU load sensitive. -Running in beaker should be ok. diff --git a/tests/upstream-testsuite/certs.patch b/tests/upstream-testsuite/certs.patch deleted file mode 100644 index 18c7136..0000000 --- a/tests/upstream-testsuite/certs.patch +++ /dev/null @@ -1,393 +0,0 @@ -commit 42d8e311ad6504dc068367a5068cee60c668bb74 -Author: Tomas Korbar -Date: Mon Apr 27 09:40:08 2020 +0200 - - Replace testing certificates and keys - -diff --git a/t/cacert.pem b/t/cacert.pem -index 522bd27..82d03a2 100644 ---- a/t/cacert.pem -+++ b/t/cacert.pem -@@ -1,22 +1,24 @@ - -----BEGIN CERTIFICATE----- --MIIDqzCCApOgAwIBAgIJAOFc3ZmVKolRMA0GCSqGSIb3DQEBBQUAMIGLMSgwJgYD --VQQDDB9UZXN0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQswCQYDVQQIDAJD --QTELMAkGA1UEBhMCVVMxHDAaBgkqhkiG9w0BCQEWDXJvb3RAdGVzdC5jb20xDTAL --BgNVBAoMBFRlc3QxGDAWBgNVBAsMD1Rlc3QgRGVwYXJ0bWVudDAeFw0xOTAxMDcx --ODIzMjlaFw0yNDAxMDYxODIzMjlaMIGLMSgwJgYDVQQDDB9UZXN0IFJvb3QgQ2Vy --dGlmaWNhdGUgQXV0aG9yaXR5MQswCQYDVQQIDAJDQTELMAkGA1UEBhMCVVMxHDAa --BgkqhkiG9w0BCQEWDXJvb3RAdGVzdC5jb20xDTALBgNVBAoMBFRlc3QxGDAWBgNV --BAsMD1Rlc3QgRGVwYXJ0bWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC --ggEBAJQcDfenVed0uJCykaWowL2qGUs9e5gyjGo9URoNhI5LDYSSq3ebxZGfbi1T --BcC7oL5OI/B0lCShPR9sJjKFkQ60vs43ltmkTLNSGoKLnxXMlBjdpCxweDDAMiF3 --p/vCG2hUa7auOkMWMYIkM81rcQsRB0qj0ilt3zcTsS860oKGzNrtPeAcz3KxbYWI --nJEhQVy3S4U59b7mm3cGz3/3m2NUjn+b8sA7J8F9K5mnFkCUCRva6zte6qmL2ruH --sGRav9ICLGxDqiJoic6Y2ReffgU77RDJO+sTuJme+VeTDE77vBIHvCVCSG+e0RSs --L+6nQYDtjHH5bLgoSXq9D3hgxEsCAwEAAaMQMA4wDAYDVR0TBAUwAwEB/zANBgkq --hkiG9w0BAQUFAAOCAQEARWcYJvkleq+qfOPPI1eQAuBf5OZwz8mthsBvMfsQMCLk --+wSxdlJvJyvPoFgZBv8YbTde2b40lQe94gTsGDUXGEkOsERrjt/jqHxO9X8n7a+z --M/okeSSYnam0Zcl1M9sa5L7BVXbGh/sE9j/bXrAhz64np5P773dZTLTPYjBf2Grp --NheCsGDtJbegJqn7pp5MfAKcyzLxnZAE0cilSVKZB7R3urISJVdwiRtkprJL7IwQ --oIu+XhUgdZbx7TQQnjTkq3COSIIof5+5oqFnhzTqfSgi/06dWWvCwl17Mz+vCMZ9 --1MA8L4cR+iNdJYlCQPbk30laJx1akfqnpv7qTXq7nQ== -+MIID+TCCAuGgAwIBAgIUdoaMai7jgEXI5Q1OWcMPoE/VtpIwDQYJKoZIhvcNAQEL -+BQAwgYsxKDAmBgNVBAMMH1Rlc3QgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkx -+CzAJBgNVBAgMAkNBMQswCQYDVQQGEwJVUzEcMBoGCSqGSIb3DQEJARYNcm9vdEB0 -+ZXN0LmNvbTENMAsGA1UECgwEVGVzdDEYMBYGA1UECwwPVGVzdCBEZXBhcnRtZW50 -+MB4XDTIwMDQyNzA2MzM0NVoXDTI1MDQyNjA2MzM0NVowgYsxKDAmBgNVBAMMH1Rl -+c3QgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxCzAJBgNVBAgMAkNBMQswCQYD -+VQQGEwJVUzEcMBoGCSqGSIb3DQEJARYNcm9vdEB0ZXN0LmNvbTENMAsGA1UECgwE -+VGVzdDEYMBYGA1UECwwPVGVzdCBEZXBhcnRtZW50MIIBIjANBgkqhkiG9w0BAQEF -+AAOCAQ8AMIIBCgKCAQEAunYFlfIfYcp7RS1+oO4x9z1C1t9FiHr+XjCrY+QI6C/r -+FSWqD4nA5LgV9youq4isYFQoXYTmtxZciggZ+wEbclAC6Dz2ZWFbYWoyUY6qAf2M -+D3rz3VNxfAVuhvs0AcQDG/0UG+EakndfC2MDD2BZkiGLFm29PubP0aHafVRzk2L4 -+vXb0NXes3qXT6wZeg0ST0qAS0gnVC9AILYiGP/s8x7iyFoGaVmm8KSwpQHghfPME -+2qU6C8sqcezsxccFZzoFWM6C+HZJi2i6vr6jXwWe0aLdZSnhkFXhiHHc1ffdZfcS -+GZpRbx32EqBnr4W7iT59XjC19HLgO3TlwqZG53tbdQIDAQABo1MwUTAdBgNVHQ4E -+FgQUT1kDDTXj0kZ+xS8covSbuV1iZ4wwHwYDVR0jBBgwFoAUT1kDDTXj0kZ+xS8c -+ovSbuV1iZ4wwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEArpon -+m4GxIVqlVanpdFoWcRAhS+lGuxClaJPI/VjmCaOb6ORyrHnk7eCwKXgDgsWcM87N -+tiakQH4Y2zHCN3HVkIjWgwrNLkdwSPYykYsWGxc+tgonYkNqyo0gMk8fDT/pwLzO -+LcnvKS0HIoYYDuCbeZsyv48kDjSplAD1Ybl3+4lZ544O7SW6+5tSTwTgg4py93yc -+WHBTDdjNMUqLarpgYA0RKVQoyJe9wLpNd3kWctobkKGBOP7/9THWTqMRFW7TUWO2 -+yjxMbklUSH7W2jA/2KzF4IdN6G8Bn52vd+nWU29g4rfmLKZvQZPhvjjGdsE59Xq3 -+EVAvVnZm52Ne+YlbRg== - -----END CERTIFICATE----- -diff --git a/t/cakey.pem b/t/cakey.pem -index 3396f25..15cfe41 100644 ---- a/t/cakey.pem -+++ b/t/cakey.pem -@@ -1,30 +1,30 @@ - -----BEGIN ENCRYPTED PRIVATE KEY----- --MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIigxGWoxgfJACAggA --MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHgfMUpgAX2tBIIEyFcJT6kFw1TH --kmwmbtB+MPW3+zUxoKZuP+L7UCaMHQPHcQ4/AThVNPPhXa++/lgL0P1q33SBhqsm --HK5nRfzEe75bQIFoZ1FFg3YGaAB4KUPm5vJ4XhmyzCEiUvp75mgiw38fkL5ZCPqW --eitNKgyAYEl9zIrF1cRyN/s6O6mPR8NOPbVL2ZtCGGvy/LN+mhlolvuMFySEEI+s --nzu5682LU7QQOzLFB/q3Vqrt2tafzoIHYtj8YYVsPMO6bWkoKx1BWyTCuesFOLTN --agnXx3AKtmD8Q0C3vvdmpqNnWw1iP1Vc4r/BZwmD2MFXUh8cExBGRaPIfUr41BoR --p1bHqtcAsbipuU7qQ6wjnLyuqAvFQxy1LCBGNyBrzMMD25+lXh9BoeS9H5L+WW0N --pcAPA5FoD1RQc27ZXVf0kRGEy8Vj/UsE3Pf74Z8u16bC+6ojAUvvvc49ERm0t85O --T5rP9ql3sITtg4EvNdNhHtYdJGVkZQ7H8T9G1OXEf4dE/vqYNnqhtFm+5CyWb8Vk --Rly2XFbBs4I4UnVIi0Nt0ybIqqwAvvKAU5kSOIEy6Q9mvUYyvBZrhY5Va2KEwaTU --ig2yjWxWFoOArE1UVu2kJaslaOKqAr9OPqW510+6G9s+lREm7EYqUd6Ut1cwcXUv --/s1fdx/As6U6qApH9+TC0XqNm5yXNCuADVtK2PmOoanczpEXZTZGijylGFDROQQj --bofjoB0hiN80Xc+II0zClGwXwZz43Xy4uVIMbvMBi3yp03ct1RMwORPCGkiH/1uV --iazsfV4DAD8KdGmgUL57WfnMPZJCEfqpM4YrM7rKu3Md8v8hKyFGUAdeNsCFTwwY --g2E6NXWbtqGrUFC/r/70/axfijWRoyPaLcBoourc5HcZ+K/TmmY+uOxKBcJsfS/t --HiRZ5l48sva+lZVWN6KNG5N93pa3TqgCCfp56VPOo3o3kj4XAJ3aMK6RsK3QrGi7 --TTXlv/hKFYW3GUJ0IGNfinnARbdMoD6ww8nQLe3Id3HKzqh7xfQb4xJZpQhpSXVS --KJmf5H80GHQnJq54Xwi7daYmxpTS+yNHuxKq+ryBqO7WeotNkOCbG6Flc/GBO6a3 --7rbSOTmqpyJPTRPQEf1ogHNgCG9txPIbZRAi9PPJVn/gV/dKttUpj5OGI9fjDaSK --ILEwLuokdRwTAGeFRIkucKnvA0pzXQkZRMG4D4kYzxskutUQVvKFAsqvEkb2c6qL --j8MjKYfYZqxG44o68aOk8H42vR6lkemclj6byvLfnqbZPUka3MUnrG8oPI+vNLlg --N57QpU2Kw5joBf1oCSROTXEv3BT/JYE3qQ2T6q/NGgG0s8aXbROh/7HaZJrENmoD --pDJZp+bSGn6On6vmDu98F3fyubKgg611tA5pyDdWE4MSvJBGKHc2/HmqgxbLtK1c --gn2BBefAi+Qqzc+XSeJxh2nlAx7ohvgEcodO3Vqb9eSoPviMHyO9bap8QIFJqTNW --QK6rMqtou0QTEcXp5cIlVRW59zZHKEPpNpJ08fNtxB5n/Ngo+vo86LLVUysfbwkY --p7GK4kraBGhU3rEXzuFBXn1Cr7015VrAC8mLafKqar7OLhLduHDRPxGidXJc6oxE --2PpJudZFhS6P+0M5AkMq2Q== -+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQII8yP9NBTVEACAggA -+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOLCMMR2QyzdBIIEyMf2/xsaOdiV -+LijpsozRrg7iABViWNW6jD1yfth5zsqVEhdhKgXGWXmOp6GtPh6HH59C9PuVl02g -+T5kdvI3sCQ45ypJ0+voo4vN+gOU9sFaMZ2AirUFypPwwyuui8BcjVwvdoqioQTp/ -+kCI16R4CZtKLbbUHK3YQeYp8IEi87AQbdUK/kYRKJVfmAM0DmvJoTqLozwaX7G2f -+I70dJff8clCP5RYlEcD9y4+OMhiR8cWXbiHjG098KwE2ciavbBWN5S3jmKaefp0O -+G5X0k2uXlLSvnC67yqbH41n67LPBBH79w5n3I2XeSszDTNCnr+RUCd514nOEZXJJ -+1VQI0NdpMD5RmHBBkvc/DS5Bu5lnPqZO1w2JwfhpjjsbmB29ZKmuEof1E0Z5DcWV -+EhZgwdZG/7kzSQqbVQYNVwfLJloQE2FSibGUVZQuXrGzWvznAEhoY5FnjCSz/1JY -+JWlMHVWWW56sfA+vSXS1sbm1vJzMaB1w/dap9mzxiWvOgRlu9LzNXfzc3z7wPG1f -+OMDk/JzwSK36ijq+sdsywaEwgaCFpsLXgB2GfNnJ5IfEfL71hjGqpjAkM1tQf7sA -+bz0hY4qnmPjCStwdyujvsXz5JbeJFDK7DIyHW4Efoj1PVchOEqDq7NU6x0NWmcnP -+unpRV61BvKAkiYBBk0TJnuHBeQeP1kHmuj1Ez2SIhP43qr8fcnvOyAsCYDI+ig7G -+iCuinAiq2pwsruBOAFMc019C1ILgNkZrjOrnBsi/gzyEjPBAj143mopuHA05nr8S -+SsJbclEw1oPmpek6eGJujIwlDgx1tOb0gErCzfvHwUcZ/ivr8WKl4ptkXS8LaSNs -+1yv44MGprz3qbnwmJUtvUces3UFdmrbZomsJutXWFCHxsuWjRXGbIWqCmlhvmTy/ -+Wamzw/f7z6vcCYU9AJPxYNkyfy9JlK4HnoI/ol+59+wQhh8uPYpLAkXVM1mhJ/NZ -+3HdfUHovZNIn7l0L0Pfvzy1ZMAY9Lu40wlV6ZOZvSSlCG68BZF3xN0aIwW0cXBpI -+gxRlteDK9EqlOOr02xMc+W1CxGW/a5T4YoIN6IY5nbhD4xCZFO63KeJsC5TPNXPm -+z2SHoFqTsN82COoCysIdqCfegcrZltnm440C8vhRdgPMgnJnU0bcMzRrmndOHXaz -++GsX+/WCVdKLGGpMWCpAET24gA/KF6QuzcRUvDUKrAwr6ZIlumc3daXTSU1cJLcV -+uxvWIMoZ9IZCmImTPuzkI74BCqf2Si6G4n5dM3JB8blY9AmsxeOioI+EkGFLGWkp -+wii3rSon9umzsLWSAuS/is6iVk7R5CMYAPa1mdec3do2/8NbKgX7miCxBLYuO9L8 -+ObRtxLtv9xVLtwmGh5EE3vsp7+KWE1kTkrYYEfZW8Yhtxb7f8rfQi7EX8n05XHt1 -+4iNjKy8dT6F8J8p4Vh/SYc/tJDZw2C66rBrDfR6UuEk1BrrTT96SeNXqUetzwkIP -+Ak+r5+HuhwQqgQsvYF90D8QgiJ5+XPDIRVbdeCG5NaW1gza5WJ5Y1qmflGiy9nve -+rctwKxuKXIwl0GT0WZZxeeefAC2BQ6Wl2uvA8jpS8VT24MwI6Nazu5d72VPvs0tw -+TIRsDH+GQXfzwu9tJ4QcQg== - -----END ENCRYPTED PRIVATE KEY----- -diff --git a/t/client_crt.pem b/t/client_crt.pem -index f9031ee..879534d 100644 ---- a/t/client_crt.pem -+++ b/t/client_crt.pem -@@ -1,68 +1,22 @@ --Certificate: -- Data: -- Version: 3 (0x2) -- Serial Number: 2 (0x2) -- Signature Algorithm: sha1WithRSAEncryption -- Issuer: CN=Test Root Certificate Authority, ST=CA, C=US/emailAddress=root@test.com, O=Test, OU=Test Department -- Validity -- Not Before: Jan 7 19:26:14 2019 GMT -- Not After : Jan 6 19:26:14 2024 GMT -- Subject: CN=client.test.com, ST=CA, C=US/emailAddress=root@client.test.com, O=Test Client, OU=Subunit of Test Organization -- Subject Public Key Info: -- Public Key Algorithm: rsaEncryption -- Public-Key: (1024 bit) -- Modulus: -- 00:a6:a4:24:19:14:9e:96:0a:3e:b8:14:7b:e9:04: -- ca:a0:ef:61:1a:e6:63:84:51:34:10:58:9e:f2:6f: -- 9d:27:64:e5:a9:32:02:e2:fb:f0:c5:47:d0:b2:8f: -- f4:19:71:2a:de:f8:de:ae:cb:0b:41:cf:cc:76:63: -- 9b:4a:9b:12:50:5f:b9:b4:fc:e3:fd:05:85:7f:a7: -- 1c:ad:ec:d1:40:70:fa:4c:51:88:a3:d4:e5:49:b2: -- 72:7c:2e:4d:c5:00:ae:40:96:15:84:34:5f:99:75: -- 7b:6a:00:d3:ec:a0:7d:82:d3:71:a3:79:cc:d4:4c: -- 3b:50:49:d0:9b:27:e4:0b:cb -- Exponent: 65537 (0x10001) -- X509v3 extensions: -- X509v3 Basic Constraints: -- CA:FALSE -- X509v3 Key Usage: -- Digital Signature, Non Repudiation, Key Encipherment -- X509v3 Subject Alternative Name: -- DNS:client.test.com, DNS:alt.client.test.com -- Signature Algorithm: sha1WithRSAEncryption -- 4f:11:ff:ed:05:e2:80:75:bd:e0:b3:f3:21:34:65:50:67:ff: -- 3c:45:88:58:58:77:9a:6e:f6:1e:74:f9:cb:02:e1:31:e0:52: -- d9:f9:63:e5:fb:01:d2:83:df:20:c1:77:a7:15:da:18:3a:e0: -- ea:e0:66:ab:41:21:9e:36:9c:36:28:1c:cb:20:43:94:94:e8: -- 9b:0d:3d:2a:ac:20:48:5b:b8:c0:45:0d:5c:30:91:be:ba:67: -- b9:f6:bd:64:08:ab:af:35:a1:db:dd:54:e8:32:c9:3a:95:34: -- 26:8f:a1:1b:a1:a2:32:47:a0:e0:a4:11:06:dc:d2:67:87:1a: -- 51:50:bc:09:26:e3:1c:e7:83:a5:69:48:92:6c:87:94:46:f6: -- b2:45:55:6f:5e:f2:6b:c8:9d:65:61:31:83:09:71:60:71:d5: -- 9c:44:65:27:f6:3f:fd:fb:40:30:47:02:b1:6f:5a:ff:7a:c5: -- 83:e0:80:52:53:a7:2c:24:71:51:81:df:3f:2f:1d:42:df:bc: -- 86:b4:0c:18:64:8d:33:a7:c0:e8:f2:9e:f5:0b:92:c4:4d:f7: -- 4b:2f:13:8d:81:25:f3:47:f5:72:71:c2:62:3d:36:09:3c:ec: -- d1:15:6d:15:77:28:c6:de:f9:73:5d:5b:a0:a4:0f:f2:50:a0: -- 00:20:87:fa - -----BEGIN CERTIFICATE----- --MIIDZTCCAk2gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBizEoMCYGA1UEAwwfVGVz --dCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eTELMAkGA1UECAwCQ0ExCzAJBgNV --BAYTAlVTMRwwGgYJKoZIhvcNAQkBFg1yb290QHRlc3QuY29tMQ0wCwYDVQQKDARU --ZXN0MRgwFgYDVQQLDA9UZXN0IERlcGFydG1lbnQwHhcNMTkwMTA3MTkyNjE0WhcN --MjQwMTA2MTkyNjE0WjCBljEYMBYGA1UEAwwPY2xpZW50LnRlc3QuY29tMQswCQYD --VQQIDAJDQTELMAkGA1UEBhMCVVMxIzAhBgkqhkiG9w0BCQEWFHJvb3RAY2xpZW50 --LnRlc3QuY29tMRQwEgYDVQQKDAtUZXN0IENsaWVudDElMCMGA1UECwwcU3VidW5p --dCBvZiBUZXN0IE9yZ2FuaXphdGlvbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC --gYEApqQkGRSelgo+uBR76QTKoO9hGuZjhFE0EFie8m+dJ2TlqTIC4vvwxUfQso/0 --GXEq3vjerssLQc/MdmObSpsSUF+5tPzj/QWFf6ccrezRQHD6TFGIo9TlSbJyfC5N --xQCuQJYVhDRfmXV7agDT7KB9gtNxo3nM1Ew7UEnQmyfkC8sCAwEAAaNLMEkwCQYD --VR0TBAIwADALBgNVHQ8EBAMCBeAwLwYDVR0RBCgwJoIPY2xpZW50LnRlc3QuY29t --ghNhbHQuY2xpZW50LnRlc3QuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQBPEf/tBeKA --db3gs/MhNGVQZ/88RYhYWHeabvYedPnLAuEx4FLZ+WPl+wHSg98gwXenFdoYOuDq --4GarQSGeNpw2KBzLIEOUlOibDT0qrCBIW7jARQ1cMJG+ume59r1kCKuvNaHb3VTo --Msk6lTQmj6EboaIyR6DgpBEG3NJnhxpRULwJJuMc54OlaUiSbIeURvayRVVvXvJr --yJ1lYTGDCXFgcdWcRGUn9j/9+0AwRwKxb1r/esWD4IBSU6csJHFRgd8/Lx1C37yG --tAwYZI0zp8Do8p71C5LETfdLLxONgSXzR/VyccJiPTYJPOzRFW0VdyjG3vlzXVug --pA/yUKAAIIf6 -+MIIDqjCCApICFHGl9/OPfgrXec626wFgrADDdlqfMA0GCSqGSIb3DQEBCwUAMIGL -+MSgwJgYDVQQDDB9UZXN0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQswCQYD -+VQQIDAJDQTELMAkGA1UEBhMCVVMxHDAaBgkqhkiG9w0BCQEWDXJvb3RAdGVzdC5j -+b20xDTALBgNVBAoMBFRlc3QxGDAWBgNVBAsMD1Rlc3QgRGVwYXJ0bWVudDAeFw0y -+MDA0MjcwNjU3MjNaFw0yNTA0MjYwNjU3MjNaMIGWMQswCQYDVQQGEwJVUzELMAkG -+A1UECAwCQ0ExFDASBgNVBAoMC1Rlc3QgQ2xpZW50MSUwIwYDVQQLDBxTdWJ1bml0 -+IG9mIFRlc3QgT3JnYW5pemF0aW9uMRgwFgYDVQQDDA9jbGllbnQudGVzdC5jb20x -+IzAhBgkqhkiG9w0BCQEWFHJvb3RAY2xpZW50LnRlc3QuY29tMIIBIjANBgkqhkiG -+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnpqUzCGkAeydxDdBjGL2BfLwsomljGJAeH2R -+bhV2l8AO4NESd89RQvluGuuaJMZcXQuMBF9PnPK+A5/iuQch6399DjGyxDyG14O8 -+dbYC1ms32nDtFINZ3RiPBlUgJtP8PJoMomYUpV+4zJ92y/FHYWsOnli691iJZDkI -+I8t3himpVXlST7eSNo4+wsYv6iWGi4iRFpDIyjYVl1YvfKmnMgSbr3GoNG1btz6l -+bZDDccezwX6IPP4aWCK+pRuSadHZQiFiMxEF0JLYr1PD8zoXSdy4WyJaTTcM/r/C -+yq7bUKs8xbRDZBjvPs97srfwDIBvvSU0MeR35Ixzb3I/LDIQJwIDAQABMA0GCSqG -+SIb3DQEBCwUAA4IBAQCqwFpr1i8ksf4BOninbRmC0xpAjmvDno6N4IolKI6StI4F -+rKFlfKB+iYLjF0EW7JV2g1upNuv7btY3c6tGI53JmXIcDCXo5yJMILAFOpVXzh+T -+gj8r5nK3Z9ODznON+2lk1aZSOm6iDRUFecFg2ANK9tZj9/RDkk/rL1NEm8gze5qi -+EFRxzUxqoFFMStYmyyEU8FQq6LW5zLJvF3XeBM1wUgDGk2a0w/OOc8lPCrA7ETaI -+d9S2W6Lq29+Qsdmlhqd0gmAQssEyO6e5h2FmljfjYv96VuTsfHMWyBaigUkZOXs/ -+8qHiWI/vyC21o8Yi0SKR2W6aLIdWUtDppv7mRE+O - -----END CERTIFICATE----- -diff --git a/t/client_key.pem b/t/client_key.pem -index 22d1e37..2be5fba 100644 ---- a/t/client_key.pem -+++ b/t/client_key.pem -@@ -1,15 +1,27 @@ - -----BEGIN RSA PRIVATE KEY----- --MIICXAIBAAKBgQCmpCQZFJ6WCj64FHvpBMqg72Ea5mOEUTQQWJ7yb50nZOWpMgLi --+/DFR9Cyj/QZcSre+N6uywtBz8x2Y5tKmxJQX7m0/OP9BYV/pxyt7NFAcPpMUYij --1OVJsnJ8Lk3FAK5AlhWENF+ZdXtqANPsoH2C03GjeczUTDtQSdCbJ+QLywIDAQAB --AoGAXFVMrxzutiIdGHA5LCb8g2m/+2C2uYUo/PmtsJVJlZ9hZXuRf+WrRhSBvb7n --uQUshPmOoXld1mxmVR7h19fOsBbgKYqwDTlLZEnvdMVzaGiyeHiwDAvJgkkrK7pV --kod5JIjFd+UMho6+Qn3K7tzfttLze5xuBPNrMH3q2b8LgBECQQDbJVyF+gLk4gmd --BBInYl0BHPjYmGW9xfHfn0fhkKhQCZ9eNzH5Wbk1D8yqdlfmJ5nI8FkLQunzwzgv --P51m+USJAkEAwqpaJoVOaaRfmsgEXOsZop32DBCBHwOqOyqH9qMez8qfBPDHrUbA --TMtJN/TqLhi4VEPeaHbioUdUybA+1MggswJALWEgNrId1U2lVflY1QT+Y1OfiCKO --tux9eKQgG2p8IA7ODJF7bLoSqxU5eXcGHqfGpaB3n+hcT9j2Enqm2oL1mQJAIp53 --D9ivPDxeQEGH/RpWYcQjyLt6qxBUytbifSs/RIbtRsynRhqKAl44tDnbF72PsnSr --bfqOjU4JNyEf22mH3wJBAK1yx2ilG//KYHtcfFYtll0Rkkife+2It6bTMVdkeVCH --o5iDnW/+VsJCawhS9jHLZAjors+A9iyjygl1O6zLZTE= -+MIIEogIBAAKCAQEAnpqUzCGkAeydxDdBjGL2BfLwsomljGJAeH2RbhV2l8AO4NES -+d89RQvluGuuaJMZcXQuMBF9PnPK+A5/iuQch6399DjGyxDyG14O8dbYC1ms32nDt -+FINZ3RiPBlUgJtP8PJoMomYUpV+4zJ92y/FHYWsOnli691iJZDkII8t3himpVXlS -+T7eSNo4+wsYv6iWGi4iRFpDIyjYVl1YvfKmnMgSbr3GoNG1btz6lbZDDccezwX6I -+PP4aWCK+pRuSadHZQiFiMxEF0JLYr1PD8zoXSdy4WyJaTTcM/r/Cyq7bUKs8xbRD -+ZBjvPs97srfwDIBvvSU0MeR35Ixzb3I/LDIQJwIDAQABAoIBAAcPzuw/2zOSu3uP -+EkYT6exd4sWwR0S24zP6M015eyxKit8LsAzRmEapIHPmZZiZlGc4KmXPcJYGYNt8 -+dPXUEXiQ1pqZL+J453AVF4EON5Ygc/4v5P5y0r97ZnLbu3C/I433NfTNIsIyPuIt -+f3aZKZp2z9HRFZIJySRDPc+KMaoxgrhrNxeOb5hVEpPnOyK8wKpR7iRe2hWhpVQ4 -+SHJ/R3Lu+ctydtEcHyxu08rhTShDHIgq78vkhahlqV+BudkpLiwnL5/Rl1w70Jxt -+G+KUVIQF/05yvqF9p19SJXlMyQXgy+yP7LMr83X7t1KJX7tAEUhRiA5a3rwhvFo8 -+QcuWucECgYEA0r8L1RykDpMWMb8+UYN9jsazD7Mds9ei6A3DTUKNxb2K++hfsZHu -+/Wt57y9wTO46SDNhlsmbRhqxciKsO89FV+87mRYc5SBgJGxgCVKnknVhdrhs5LiH -+damDyJaEW/6xCDffhLLcDgyBXGWkTxSNK7xfSXLpki4D81nxuOHMOXECgYEAwKk1 -+NV4bIjB7evF5kKyAA8gdlHzN7nqVBhHxOV0My63QagyH2eVwIYmH+2aQDc0MNcBX -+jQNptie+srOkvEtTL/e2mw3B14kkauWhaOOUh0FmFY4s2s1V2qAGCmUY7DltrVQd -++kDidf6dqvJ6E1DAgpv8c/e/q7jyycfk4vLL1xcCgYB0PZQVM/r5Xv+66LVC2LgE -+bGyPmEglzia4v/6dOrxf+TATyhQeKVQcy48x8oSKqkvTTyPgu8q9XDPLtHwzcRva -+aMYCpkPBzZ25+VzvR3vOOJhNl2PYtD9jEuDxXrQa2dxjoA3Vb6IYzaT8hcOfKsLD -+AN+973gNfPwI2e+N/l1awQKBgD0yQi12e+XrQn210ChtMqiA2yx8TClRFJ79+gJ/ -+lP3pcwcMfeZvo6NzfRcU5/MKS7OTKfwntl9e1osK1uvcfUsCQyWTRBxDeqbd09xu -+VZJ06ok0RPknOfsc025f2H/IahchXfhMveI/AzP2m2IhR1T1WUY4ztAsCiqf7QtN -+lgP3AoGAUvGrZ7xRIBYg1BEmvFOofpe0pyj5p+cJFhpAeYP/p6399+RPllGyW6Z1 -+4l8Dv2IiGpljJYpvFwQ1EPMK8FSLwr3ADu2bJTkgXQaR8NkQLqpJsNvBbnY02bvD -+dNcllsZ8Wh+QL9D3mm1lqBrO/YttZcG8n9qSQcVRrYKPGAqX6Yw= - -----END RSA PRIVATE KEY----- -diff --git a/t/server_crt.pem b/t/server_crt.pem -index 6b7a315..b734fdf 100644 ---- a/t/server_crt.pem -+++ b/t/server_crt.pem -@@ -1,67 +1,22 @@ --Certificate: -- Data: -- Version: 3 (0x2) -- Serial Number: 1 (0x1) -- Signature Algorithm: sha1WithRSAEncryption -- Issuer: CN=Test Root Certificate Authority, ST=CA, C=US/emailAddress=root@test.com, O=Test, OU=Test Department -- Validity -- Not Before: Jan 7 18:25:01 2019 GMT -- Not After : Jan 6 18:25:01 2024 GMT -- Subject: CN=test.com, ST=CA, C=US/emailAddress=root@test.com, O=Test, OU=Subunit of Test Organization -- Subject Public Key Info: -- Public Key Algorithm: rsaEncryption -- Public-Key: (1024 bit) -- Modulus: -- 00:ca:76:35:79:91:e8:a2:ee:ef:f4:35:7e:29:85: -- 75:90:65:5a:60:f8:a0:d9:ef:68:d1:61:79:69:d7: -- e2:7b:f1:67:71:65:50:31:4e:9a:f8:6f:27:e9:05: -- 0b:0e:76:95:24:9b:c2:bf:90:e5:6b:45:fd:e3:54: -- ac:d5:62:90:4e:37:de:8f:ae:96:f6:b3:57:eb:ad: -- b8:44:13:5d:a7:34:76:c1:26:49:91:67:3e:5e:52: -- 68:c1:1c:7f:91:c7:9e:01:e2:be:a7:a8:eb:3f:44: -- 6d:c7:c5:82:4b:97:d9:3f:c0:51:99:1b:20:df:12: -- a3:e6:bb:66:45:6d:b4:e1:07 -- Exponent: 65537 (0x10001) -- X509v3 extensions: -- X509v3 Basic Constraints: -- CA:FALSE -- X509v3 Key Usage: -- Digital Signature, Non Repudiation, Key Encipherment -- X509v3 Subject Alternative Name: -- DNS:test.com, DNS:alt.test.com -- Signature Algorithm: sha1WithRSAEncryption -- 61:c1:18:b4:04:79:05:0e:b9:79:2f:0e:3f:aa:f1:36:e3:90: -- b9:c6:99:25:53:4a:06:64:52:92:29:c5:09:41:a6:16:74:1b: -- 3c:4e:81:32:c2:d8:54:e0:1e:08:45:cf:f1:d0:ad:ea:11:1a: -- b5:cf:7c:98:8a:dd:c1:01:e4:d0:f5:8e:60:fa:7f:e7:74:2d: -- 91:43:81:bd:95:92:41:66:84:8b:8c:70:d7:2f:d4:2f:37:82: -- 8f:9a:ef:c0:7d:c5:56:56:92:7a:00:b6:30:65:37:4c:6c:7a: -- ba:cc:e2:dc:73:e9:f5:2c:3c:3e:31:67:ee:3d:b7:78:96:89: -- ba:be:4f:85:a2:a8:83:3e:53:20:f0:bf:29:50:dc:23:38:58: -- d8:33:f5:7b:4a:12:df:2b:34:4c:1c:f1:76:6b:86:95:74:43: -- 29:f7:68:f0:ca:04:08:89:ac:97:7d:05:14:a0:ca:81:56:5c: -- dd:c3:56:a3:53:01:0a:01:5c:55:b4:39:10:1b:be:47:19:58: -- a1:f2:e6:0c:08:95:b0:35:4e:6c:81:6d:b9:cf:0e:5c:70:ff: -- f3:b4:a7:95:69:1a:58:b7:ac:cc:2c:79:47:7e:20:17:cc:36: -- be:2c:10:11:31:28:63:dd:6f:8d:8d:e9:11:ea:ca:fc:10:0a: -- e0:ae:53:db - -----BEGIN CERTIFICATE----- --MIIDQjCCAiqgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBizEoMCYGA1UEAwwfVGVz --dCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eTELMAkGA1UECAwCQ0ExCzAJBgNV --BAYTAlVTMRwwGgYJKoZIhvcNAQkBFg1yb290QHRlc3QuY29tMQ0wCwYDVQQKDARU --ZXN0MRgwFgYDVQQLDA9UZXN0IERlcGFydG1lbnQwHhcNMTkwMTA3MTgyNTAxWhcN --MjQwMTA2MTgyNTAxWjCBgTERMA8GA1UEAwwIdGVzdC5jb20xCzAJBgNVBAgMAkNB --MQswCQYDVQQGEwJVUzEcMBoGCSqGSIb3DQEJARYNcm9vdEB0ZXN0LmNvbTENMAsG --A1UECgwEVGVzdDElMCMGA1UECwwcU3VidW5pdCBvZiBUZXN0IE9yZ2FuaXphdGlv --bjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAynY1eZHoou7v9DV+KYV1kGVa --YPig2e9o0WF5adfie/FncWVQMU6a+G8n6QULDnaVJJvCv5Dla0X941Ss1WKQTjfe --j66W9rNX6624RBNdpzR2wSZJkWc+XlJowRx/kceeAeK+p6jrP0Rtx8WCS5fZP8BR --mRsg3xKj5rtmRW204QcCAwEAAaM9MDswCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw --IQYDVR0RBBowGIIIdGVzdC5jb22CDGFsdC50ZXN0LmNvbTANBgkqhkiG9w0BAQUF --AAOCAQEAYcEYtAR5BQ65eS8OP6rxNuOQucaZJVNKBmRSkinFCUGmFnQbPE6BMsLY --VOAeCEXP8dCt6hEatc98mIrdwQHk0PWOYPp/53QtkUOBvZWSQWaEi4xw1y/ULzeC --j5rvwH3FVlaSegC2MGU3TGx6uszi3HPp9Sw8PjFn7j23eJaJur5PhaKogz5TIPC/ --KVDcIzhY2DP1e0oS3ys0TBzxdmuGlXRDKfdo8MoECImsl30FFKDKgVZc3cNWo1MB --CgFcVbQ5EBu+RxlYofLmDAiVsDVObIFtuc8OXHD/87SnlWkaWLeszCx5R34gF8w2 --viwQETEoY91vjY3pEerK/BAK4K5T2w== -+MIIDlTCCAn0CFHGl9/OPfgrXec626wFgrADDdlqgMA0GCSqGSIb3DQEBCwUAMIGL -+MSgwJgYDVQQDDB9UZXN0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQswCQYD -+VQQIDAJDQTELMAkGA1UEBhMCVVMxHDAaBgkqhkiG9w0BCQEWDXJvb3RAdGVzdC5j -+b20xDTALBgNVBAoMBFRlc3QxGDAWBgNVBAsMD1Rlc3QgRGVwYXJ0bWVudDAeFw0y -+MDA0MjcwNzAxNDJaFw0yNTA0MjYwNzAxNDJaMIGBMQswCQYDVQQGEwJVUzELMAkG -+A1UECAwCQ0ExDTALBgNVBAoMBFRlc3QxJTAjBgNVBAsMHFN1YnVuaXQgb2YgVGVz -+dCBPcmdhbml6YXRpb24xETAPBgNVBAMMCHRlc3QuY29tMRwwGgYJKoZIhvcNAQkB -+Fg1yb290QHRlc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -+1sxw4SSmEUmA0kRLYLdbe//tKrrd5YhN2dFawCRC50CrTc3xueOMtpMvWubrRTbz -+XuKOGl26/bX3ZtcjIN8ItXBFQwEDR3tuK2wb2LYgvnxFSb4XoQBoqBHzHxXDDjlr -+Fu4FNg4HTcMo9pucZuK1VnY4/RLbQfrkAmdkVKR9KJ83TuISGX95FBfl3cASfDNS -+/9+CCDthtcZZUEmThyCXRVIzS5UIDG8pI3Tj3CIZ1LZ55h1PB3VH2SXuBZfMeIS5 -+ZDab0rn5LA9A6OkWzxf1O/tWpYAaKZOQC9ZMmo+O2d2cnQbaodu8RBSwk4CMPTfn -+w0sEAYFL+XjQtO1ReCT9zQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAUHip6lB3H -+mmnBUa9X0LVTUS+7pab6KMQCqXSDuD7OJkTd53HvPvYgkdrzr4fEwdxtZO5khpgH -+RYwjLrN67cTdOlyrIP8WfWZTRX7V//vdR+YloTyXJ9sE9fTeu/IYrJmmszm0wAj5 -+U2oitWSMKoGMKk4cRcqUaHrBD13CCTf01Vq/Y2Ld4eM3jy8RjeSRG0PSoeoUe/mx -+TpcvfnEqDGekRomTGQTUk6Wzl+pUDU3wic2n8paETICeZsIz7D1NJV/OEPXlfqO3 -+/gJajsMxGlWollQDxPJbVWPX5tuWpUeigIhSJQTJFfqtuN00iY2vljYIVsanZvTu -+uEp1rzBUDmS0 - -----END CERTIFICATE----- -diff --git a/t/server_key.pem b/t/server_key.pem -index 9e02ce4..97b0b29 100644 ---- a/t/server_key.pem -+++ b/t/server_key.pem -@@ -1,15 +1,27 @@ - -----BEGIN RSA PRIVATE KEY----- --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 - -----END RSA PRIVATE KEY----- diff --git a/tests/upstream-testsuite/main.fmf b/tests/upstream-testsuite/main.fmf deleted file mode 100644 index 6fab73a..0000000 --- a/tests/upstream-testsuite/main.fmf +++ /dev/null @@ -1,46 +0,0 @@ -summary: Test for BZ#1613690 (rebase memcached to 1.5.9) -description: | - Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1613690 - - The testsuite is not run during package build by devel since it is CPU load sensitive. - Running in beaker should be ok. -contact: Petr Dancak -component: -- memcached -test: ./runtest.sh -recommend: -- autoconf -- gcc -- cyrus-sasl-md5 -- cyrus-sasl-plain -- cyrus-sasl-devel -- perl-generators -- perl-Test-Harness -- perl-Test-Simple -- automake -- memcached -- rpm-build -- libevent-devel -- openssl-devel -- selinux-policy-devel -- rhts-test-env -duration: 130m -enabled: true -tag: -- NoRHEL4 -- NoRHEL5 -- NoRHEL6 -- TIPfail_infra -- TIPfail_samba -- TIPfail_systemd -- TIPpass -- Tier1 -- notier -tier: '1' -relevancy: |+ - distro < rhel-8: False - purpose=gating && distro < rhel-8.3: False - -extra-summary: /CoreOS/memcached/Sanity/upstream-testsuite -extra-task: /CoreOS/memcached/Sanity/upstream-testsuite -extra-nitrate: TC#0590517 diff --git a/tests/upstream-testsuite/no-abort.patch b/tests/upstream-testsuite/no-abort.patch deleted file mode 100644 index 0207dd7..0000000 --- a/tests/upstream-testsuite/no-abort.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 165a0e6b29c841c121bd20d3d6fc04e3110cbb68 -Author: Tomas Korbar -Date: Thu May 21 08:42:02 2020 +0200 - - Remove test which forces memcached to call abort - - We will disable this until suitable fix is found. - -diff --git a/t/restart.t b/t/restart.t -index dde0b31..e22d38a 100644 ---- a/t/restart.t -+++ b/t/restart.t -@@ -12,15 +12,6 @@ use MemcachedTest; - # /dev/shm. - my $mem_path = "/tmp/mc_restart.$$"; - --# read a invalid metadata file --{ -- my $meta_path = "$mem_path.meta"; -- open(my $f, "> $meta_path") || die("Can't open a metadata file."); -- eval { new_memcached("-e $mem_path"); }; -- unlink($meta_path); -- ok($@, "Died with an empty metadata file"); --} -- - my $server = new_memcached("-m 128 -e $mem_path -I 2m"); - my $sock = $server->sock; - diff --git a/tests/upstream-testsuite/runtest.sh b/tests/upstream-testsuite/runtest.sh deleted file mode 100755 index a3590e6..0000000 --- a/tests/upstream-testsuite/runtest.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/memcached/Sanity/upstream-testsuite -# Description: Runs upstream testsuite built into src.rpm -# Author: Ondrej Mejzlik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2019 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE=${PACKAGE:-memcached} - -# NOTE: if you want to test scratch build in 1minutetip then enable repo containing -# src.rpm and use $ declare -x BEAKERLIB_RPM_DOWNLOAD_METHODS="yum direct" -# so that rlFetchSrcForInstalled downloads src rpm from your repository - -#how many times to repeat? -REPEAT=2 - -#how many pass is OK -OK=1 -run_and_verify_tests() { - MAKETEST=0 - for r in `seq 1 $REPEAT`;do - rlLog "================================================================" - rlLog "================ running $r / $REPEAT ========================" - rlRun "sleep 10" 0 "Wait to calm down CPU" - make test &> test.log.$r - if [ "$?" = "0" ]; then - rlLog "make test PASSed" - let "MAKETEST=MAKETEST+1" - else - rlLog "make test FAILed" - #rlFail "make test fail" - wall TEST_FAIL_EXPECTED - fi - rlLog "`echo;grep 'All tests successful' test.log.$r`" - rlLog "`echo;grep 'Result: PASS' test.log.$r`" - #a=`mktemp --suffix UpTest$r` - #cat test.log.$r &> $a - echo "---------------------- test.log.$r -------------" - cat test.log.$r - echo "-------------------------------------------------" - done - if [ "$MAKETEST" -ge "$OK" ]; then - rlPass "RUNS=$REPEAT ; make test passes $MAKETEST x => PASS" - else - rlFail "RUNS=$REPEAT ; make test passes $MAKETEST x => FAIL" - fi - - expected=$OK - if [ "$RUN_SASL_TESTS" = "1" ]; then -#SASL test has two phases, twice more PASS in one log - let "expected=OK*2" - fi - rlLog "$expected expected PASS is sufficient for this test" - rlAssertGreaterOrEqual "risk analyze a.$r" `grep 'All tests successful' test.log.*|wc -l` $expected - ls test.log.* - rlAssertGreaterOrEqual "risk analyze b.$r" `grep 'Result: PASS' test.log.*|wc -l` $expected - rlRun "rm test.log.*" 0 "Remove the test logs" -} - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE || rlDie "Package $PACKAGE not installed" - rlLog "PC name: $(hostname) User: $(whoami)" - TESTDIR=$(pwd) - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "cp ./*.patch $TmpDir" 0 "Copy patches required for valid testing" - rlRun "pushd $TmpDir" 0 "Going into tmp directory $TmpDir" - rlRun "rlFetchSrcForInstalled $PACKAGE" 0 "Get src.rpm for $PACKAGE" - rlRun "rpm --define '_topdir $TmpDir' -i *src.rpm" 0 "Install src rpm" - rlRun "mkdir BUILD" 0 "Create BUILD directory" - rlRun "rpmbuild --define '_topdir $TmpDir' -bc $TmpDir/SPECS/*spec" 0 "Prepare sources" - rlRun "pushd ./BUILD/" 0 "Cd into the source directory" - rlPhaseEnd - - rlGetTestState && { - rlPhaseStartTest - rlRun "cd memcached-[0-9]*" 0 "Cd into memcached dir" - if rlIsRHEL ">=8" || rlIsFedora ">=33"; then - rlLog "RHEL >=8 or Fedora >=33 release detected running tests with more features" - rlRun "mv $TmpDir/*.patch ./" 0 "Move patches to source folder" - rlRun "patch -p1 -Date: Wed Jun 10 09:59:19 2020 +0200 - - Adjust wait times in tests - -diff --git a/t/expirations.t b/t/expirations.t -index 47300cb..d0dddf5 100755 ---- a/t/expirations.t -+++ b/t/expirations.t -@@ -40,11 +40,11 @@ print $sock "set foo 0 $expire 6\r\nfooval\r\n"; - is(scalar <$sock>, "STORED\r\n", "stored foo"); - mem_get_is($sock, "foo", undef, "already expired"); - --$expire = time() + 1; -+$expire = time() + 3; - print $sock "set foo 0 $expire 6\r\nfoov+1\r\n"; - is(scalar <$sock>, "STORED\r\n", "stored foo"); - mem_get_is($sock, "foo", "foov+1"); --sleep(2.2); -+sleep(6); - mem_get_is($sock, "foo", undef, "now expired"); - - $expire = time() - 20; -diff --git a/t/lru-crawler.t b/t/lru-crawler.t -index 4e94fb3..c51218f 100644 ---- a/t/lru-crawler.t -+++ b/t/lru-crawler.t -@@ -81,6 +81,7 @@ for (1 .. 30) { - print $sock "lru_crawler disable\r\n"; - is(scalar <$sock>, "OK\r\n", "disabled lru crawler"); - { -+ sleep 2; - my $stats = mem_stats($server->sock, ' settings'); - is($stats->{lru_crawler}, "no"); - } -diff --git a/t/stats-conns.t b/t/stats-conns.t -index 175ded8..536a64a 100755 ---- a/t/stats-conns.t -+++ b/t/stats-conns.t -@@ -17,7 +17,7 @@ my $stats_sock = $server->new_sock; - ok(-S $filename, "creating unix domain socket $filename"); - - print $sock "set foo 0 0 6\r\n"; --sleep(1); # so we can test secs_since_last_cmd is nonzero -+sleep(3); # so we can test secs_since_last_cmd is nonzero - print $stats_sock "stats conns\r\n"; - - my $stats;