Просмотр исходного кода

Removal of old test script (#2686)

replaced by test.bats
Jaap Marcus 3 лет назад
Родитель
Сommit
471d3444c2
3 измененных файлов с 0 добавлено и 368 удалено
  1. 0 22
      test/ssl/crt
  2. 0 27
      test/ssl/key
  3. 0 319
      test/test_actions.sh

+ 0 - 22
test/ssl/crt

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDmjCCAoICCQCjpzusnGxWaDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
-VVMxEjAQBgNVBAgMCUJlcmtzaGlyZTESMBAGA1UEBwwJV2VzdG5vcnRoMQ4wDAYD
-VQQKDAVWZXN0YTELMAkGA1UECwwCSVQxGTAXBgNVBAMMEGRlbW8udmVzdGFjcC5j
-b20xHzAdBgkqhkiG9w0BCQEWEGluZm9AdmVzdGFjcC5jb20wHhcNMTExMjE0MTky
-NDU4WhcNMTIxMjEzMTkyNDU4WjCBjjELMAkGA1UEBhMCVVMxEjAQBgNVBAgMCUJl
-cmtzaGlyZTESMBAGA1UEBwwJV2VzdG5vcnRoMQ4wDAYDVQQKDAVWZXN0YTELMAkG
-A1UECwwCSVQxGTAXBgNVBAMMEGRlbW8udmVzdGFjcC5jb20xHzAdBgkqhkiG9w0B
-CQEWEGluZm9AdmVzdGFjcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC85/k6Ekfo1z9AfzOFNce0rgy897nlkdiEdr67H05lhFlUHY129vzgrrZC
-kANji9sR0tGwcRdc2aHoTlbQGZ4f567LbWrUY0kc4ku56/5v74akf2P4HRm5AhSF
-6RHJfisl558i/JuO9M+fwCp1r9oOicapcyMJzaSXIeDTudWalKzwCNISH3neA+jw
-uJPFvw+NKtQoYHQN1ag24rmK1IUhdX70HverwS+DJykqEIcTMuON4FZ0UHx8Xr6U
-3pQ9yhulHTQEU03vL353ONJ6SYxzZRnt6GdE+jN+AsSDo0P7mRPoUtvi6n1AeVS+
-iSalLfZN0CEVxuMnjvA1I4DtPNZNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIft
-cXO9VpxvdlItINllvy5jrOVYn/U8NKNO1TNcqeCQmg2PQHfx8WCK4q3RBVV5aAu4
-87h6aTMH1YnxZfMtpMSZZi2FVQgeZsXs86UJu0jYXU06DApyL3G28w2LDwO/m1cw
-8xtMpofALyzmS/YKuGv5ptWCR57mw5a/5fyscWdFc3xgmZZxm/gO1o9pLcotVkLg
-H8dHFcQlqQbp2ejmvJmBdCgkNtgjdrJSVYQGsL1Ja/53S82NQD5LgDBq81kcbvqF
-ikD0BTAwKY6sETo3xCRxfno3A9ZTw7byk/QRl++qK02WrMnDVbcj1xeZR866QIfZ
-plL7FfrMTcBCs1S0Hwc=
------END CERTIFICATE-----

+ 0 - 27
test/ssl/key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAvOf5OhJH6Nc/QH8zhTXHtK4MvPe55ZHYhHa+ux9OZYRZVB2N
-dvb84K62QpADY4vbEdLRsHEXXNmh6E5W0BmeH+euy21q1GNJHOJLuev+b++GpH9j
-+B0ZuQIUhekRyX4rJeefIvybjvTPn8Aqda/aDonGqXMjCc2klyHg07nVmpSs8AjS
-Eh953gPo8LiTxb8PjSrUKGB0DdWoNuK5itSFIXV+9B73q8EvgycpKhCHEzLjjeBW
-dFB8fF6+lN6UPcobpR00BFNN7y9+dzjSekmMc2UZ7ehnRPozfgLEg6ND+5kT6FLb
-4up9QHlUvokmpS32TdAhFcbjJ47wNSOA7TzWTQIDAQABAoIBAHPgdB/sINIyXylo
-HalkAPnTHhs4dn7dBQzUblEIdiWNluIjMqi7/wiwAzs3bey9WIdJY7kw1hztnwSK
-MXR7kmSN0MoWd0aLFMk0AzGsEqqFKnlzb1Y+O44iOYafHnsT+tHIj/R9McryXv3m
-eeUxFrh+SS+eYerci07tyCT4RJAJ/3RjQvlpZbZEkS/EF4lgg+V87CNF2hYzVIS0
-obOXVMMl7TeAF56tJfFM2hjVS9lD7o7AmfpuMLirZ/HNscjx9MgUgPDTpCLQ+o5g
-bV5QC5VdJtHKaH9H11CmOyl6FQp006dOzVfhxdblNSq8d9VYrLv3IF+j8MfvTxw1
-nVUj8P0CgYEA3AggZ/EuAWBDdks3y9vTnJVoaHDjrO9j7ldqWU3UONYjYPupCWXG
-LPxfFnHwifQBW2Yp0GrGoRI1Nz8wvZ1Q9JvziaWDSWfbUP/VtEL1N8QDQDemfh+p
-vQ48rMJ0cWtRQWloTDWiRJ6S57+bUcIlXfBhieZ7fsnrL092cUS/f58CgYEA28lO
-GLQA5KdiS0cDTCrzDP2ZnfPhsHEv+M0hIbjiULKkwJZkOHfp2byRJYakoT9Dnjwo
-3N1gFqGyXeCunI2P2yxu7HsYdDUsrK16IjRDhrwm2Yi0qQdBVBdC8EtCOpgdMbPw
-j+bavowW4sdZ+Cdt1UiXJW2inkVTeMn7u/82spMCgYEA1QPNE7PrPQvL4/8IAoVM
-RYBjtxDraiXMUhcw70oo1emCEMcyq9Vq2WxuRhWCsJuYoLq0aoCk0ZUGDflQH5Ho
-qRc93Blvk6ZHLhCv/LcCHb3XA9mchufydQQOe5Y6Ev+5h6EbhwQ5l0MJp/DY1nsl
-n98zHsUS8/lZhdDhMuFCn7MCgYAvEkobmFGopwCyRp86LOipG5dO8PChLVys2KID
-6ujth5Upegw029nFvFEJzHBt6HK+7PuDchYmQrNEz94VwWvR8Q5Ar4xpNwo+YVkL
-Ak6ECL/5TwICQX+IVwMLG9MvYWy/PF6FM1gd/zrXjwKB10/6ofVdGsH9S7O45ul3
-Ng2s6QKBgQDYFKzhN8vDDGhmhDIz0uAPaMkMUvsjFHvsuurboAHgLnOstXhc/M0N
-t/AhI+TM+JewVoT6F4FGWOR6ykGn9F5N7e+rHfU+/6yloD4quDavV+4JWuJomRpC
-QE0k8Pmgm3s5xo3kyb7J9h4l3b8MF2rXTzcqyG8UQMrSRjVUJ07scg==
------END RSA PRIVATE KEY-----

+ 0 - 319
test/test_actions.sh

@@ -1,319 +0,0 @@
-#!/bin/bash
-
-# Define some variables
-source /etc/profile.d/hestia.sh
-V_BIN="$HESTIA/bin"
-V_TEST="$HESTIA/test"
-
-# Define functions
-random() {
-    head /dev/urandom | tr -dc 0-9 | head -c$1
-}
-
-echo_result() {
-    echo -en  "$1"
-    echo -en '\033[60G'
-    echo -n '['
-
-    if [ "$2" -ne 0 ]; then
-        echo -n 'FAILED'
-        echo -n ']'
-        echo -ne '\r\n'
-        echo ">>> $4"
-        echo ">>> RETURN VALUE $2"
-        cat $3
-    else
-        echo -n '  OK  '
-        echo -n ']'
-    fi
-    echo -ne '\r\n'
-}
-
-# Create random username
-user="testu-$(random 4)"
-while [ ! -z "$(grep "^$user:" /etc/passwd)" ]; do
-    user="tmp-$(random 4)"
-done
-
-# Create random tmpfile
-tmpfile=$(mktemp -p /tmp )
-echo $tmpfile
-
-#----------------------------------------------------------#
-#                         User                             #
-#----------------------------------------------------------#
-# Add user
-cmd="v-add-user $user $user $user@hestiacp.com default Super Test"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "USER: Adding new user $user" "$?" "$tmpfile" "$cmd"
-
-# Change user password
-cmd="v-change-user-password $user t3st-p4ssw0rd"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "USER: Changing password" "$?" "$tmpfile" "$cmd"
-
-# Change user contact
-cmd="v-change-user-contact $user tester@hestiacp.com"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "USER: Changing email" "$?" "$tmpfile" "$cmd"
-
-# Change system shell
-cmd="v-change-user-shell $user bash"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "USER: Changing system shell to /bin/bash" "$?" "$tmpfile" "$cmd"
-
-# Change name servers
-cmd="v-change-user-ns $user ns0.com ns1.com ns2.com ns3.com"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "USER: Changing nameservers" "$?" "$tmpfile" "$cmd"
-
-
-#----------------------------------------------------------#
-#                         Cron                             #
-#----------------------------------------------------------#
-
-# Add cron job
-cmd="v-add-cron-job $user 1 1 1 1 1 echo"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "CRON: Adding cron job" "$?" "$tmpfile" "$cmd"
-
-# Suspend cron job
-cmd="v-suspend-cron-job $user 1"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "CRON: Suspending cron job" "$?" "$tmpfile" "$cmd"
-
-# Unsuspend cron job
-cmd="v-unsuspend-cron-job $user 1"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "CRON: Unsuspending cron job" "$?" "$tmpfile" "$cmd"
-
-# Delete cron job
-cmd="v-delete-cron-job $user 1"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "CRON: Deleting cron job" "$?" "$tmpfile" "$cmd"
-
-# Add cron job
-cmd="v-add-cron-job $user 1 1 1 1 1 echo 1"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "CRON: Adding cron job" "$?" "$tmpfile" "$cmd"
-
-# Add cron job
-cmd="v-add-cron-job $user 1 1 1 1 1 echo 1"
-$cmd > $tmpfile 2>> $tmpfile
-if [ "$?" -eq 4 ]; then
-    retval=0
-else
-    retval=1
-fi
-echo_result "CRON: Duplicate cron job check" "$retval" "$tmpfile" "$cmd"
-
-# Add second cron job
-cmd="v-add-cron-job $user 2 2 2 2 2 echo 2"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "CRON: Adding second cron job" "$?" "$tmpfile" "$cmd"
-
-# Rebuild cron jobs
-cmd="v-rebuild-cron-jobs $user"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "CRON: Rebuilding cron jobs" "$?" "$tmpfile" "$cmd"
-
-
-#----------------------------------------------------------#
-#                          IP                              #
-#----------------------------------------------------------#
-
-# List network interfaces
-cmd="v-list-sys-interfaces plain"
-interface=$($cmd 2> $tmpfile | head -n 1)
-if [ -z "$interface" ]; then
-    echo_result "IP: Listing network interfaces" "1" "$tmpfile" "$cmd"
-else
-    echo_result "IP: Listing network interfaces" "0" "$tmpfile" "$cmd"
-fi
-
-# Add ip address
-cmd="v-add-sys-ip 198.18.0.123 255.255.255.255 $interface $user"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "IP: Adding ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
-
-# Add duplicate ip
-$cmd > $tmpfile 2>> $tmpfile
-if [ "$?" -eq 4 ]; then
-    retval=0
-else
-    retval=1
-fi
-echo_result "IP: Duplicate ip address check" "$retval" "$tmpfile" "$cmd"
-
-# Delete ip address
-cmd="v-delete-sys-ip 198.18.0.123"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "IP: Deleting ip 198.18.0.123" "$?" "$tmpfile" "$cmd"
-
-# Add ip address
-cmd="v-add-sys-ip 198.18.0.125 255.255.255.255 $interface $user"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "IP: Adding ip 198.18.0.125" "$?" "$tmpfile" "$cmd"
-
-
-#----------------------------------------------------------#
-#                         WEB                              #
-#----------------------------------------------------------#
-
-# Add web domain
-domain="test-$(random 4).hestiacp.com"
-cmd="v-add-web-domain $user $domain 198.18.0.125"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: Adding domain $domain on 198.18.0.125" "$?" "$tmpfile" "$cmd"
-
-# Add duplicate
-$cmd > $tmpfile 2>> $tmpfile
-if [ "$?" -eq 4 ]; then
-    retval=0
-else
-    retval=1
-fi
-echo_result "WEB: Duplicate web domain check" "$retval" "$tmpfile" "$cmd"
-
-# Add web domain alias
-cmd="v-add-web-domain-alias $user $domain v3.$domain"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: Adding alias v3.$domain" "$?" "$tmpfile" "$cmd"
-
-# Alias duplicate
-$cmd > $tmpfile 2>> $tmpfile
-if [ "$?" -eq 4 ]; then
-    retval=0
-else
-    retval=1
-fi
-echo_result "WEB: Duplicate web alias check" "$retval" "$tmpfile" "$cmd"
-
-# Add web domain stats
-cmd="v-add-web-domain-stats $user $domain awstats"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: Enabling awstats" "$?" "$tmpfile" "$cmd"
-
-# Add web domain stats 
-cmd="v-add-web-domain-stats-user $user $domain test m3g4p4ssw0rd"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: Adding awstats uzer" "$?" "$tmpfile" "$cmd"
-
-# Suspend web domain
-cmd="v-suspend-web-domain $user $domain"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: Suspending web domain" "$?" "$tmpfile" "$cmd"
-
-# Unsuspend web domain
-cmd="v-unsuspend-web-domain $user $domain"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: Unsuspending web domain" "$?" "$tmpfile" "$cmd"
-
-# Add web domain ssl
-cp $HESTIA/ssl/certificate.crt /tmp/$domain.crt
-cp $HESTIA/ssl/certificate.key /tmp/$domain.key
-cmd="v-add-web-domain-ssl $user $domain /tmp"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: Adding ssl support" "$?" "$tmpfile" "$cmd"
-
-# Rebuild web domains
-cmd="v-rebuild-web-domains $user"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "WEB: rebuilding web domains" "$?" "$tmpfile" "$cmd"
-
-
-#----------------------------------------------------------#
-#                         DNS                              #
-#----------------------------------------------------------#
-
-# Add dns domain
-cmd="v-add-dns-domain $user $domain 198.18.0.125"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Adding dns domain $domain" "$?" "$tmpfile" "$cmd"
-
-# Add duplicate
-$cmd > $tmpfile 2>> $tmpfile
-if [ "$?" -eq 4 ]; then
-    retval=0
-else
-    retval=1
-fi
-echo_result "DNS: Duplicate domain check" "$retval" "$tmpfile" "$cmd"
-
-# Add dns record
-cmd="v-add-dns-record $user $domain test A 198.18.0.125 20"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Adding dns record" "$?" "$tmpfile" "$cmd"
-
-# Add duplicate
-$cmd > $tmpfile 2>> $tmpfile
-if [ "$?" -eq 4 ]; then
-    retval=0
-else
-    retval=1
-fi
-echo_result "DNS: Duplicate record check" "$retval" "$tmpfile" "$cmd"
-
-# Delete dns record
-cmd="v-delete-dns-record $user $domain 20"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Deleteing dns record" "$?" "$tmpfile" "$cmd"
-
-# Change exp
-cmd="v-change-dns-domain-exp $user $domain 2020-01-01"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Changing expiriation date" "$?" "$tmpfile" "$cmd"
-
-# Change ip
-cmd="v-change-dns-domain-ip $user $domain 127.0.0.1"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Changing domain ip" "$?" "$tmpfile" "$cmd"
-
-# Suspend dns domain
-cmd="v-suspend-dns-domain $user $domain"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Suspending domain" "$?" "$tmpfile" "$cmd"
-
-# Unuspend dns domain
-cmd="v-unsuspend-dns-domain $user $domain"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Unsuspending domain" "$?" "$tmpfile" "$cmd"
-
-# Rebuild dns domain
-cmd="v-rebuild-dns-domains $user"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "DNS: Rebuilding domain" "$?" "$tmpfile" "$cmd"
-
-
-# Add mail domain
-cmd="v-add-mail-domain $user $domain"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "Adding mail domain $domain" "$?" "$tmpfile" "$cmd"
-
-# Add mysql database
-database=d$(random 4)
-cmd="v-add-database $user $database $database dbp4ssw0rd mysql"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "Adding mysql database $database" "$?" "$tmpfile" "$cmd"
-
-# Add pgsql database
-# database=d$(random 4)
-# cmd="v-add-database $user $database $database dbp4ssw0rd pgsql"
-# $cmd > $tmpfile 2>> $tmpfile
-# echo_result "Adding pgsql database $database" "$?" "$tmpfile" "$cmd"
-
-# Rebuild user configs
-cmd="v-rebuild-user $user yes"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "Rebuilding user config" "$?" "$tmpfile" "$cmd"
-
-# Delete user
-cmd="v-delete-user $user"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "Deleting user $user" "$?" "$tmpfile" "$cmd"
-
-# Delete ip address
-cmd="v-delete-sys-ip 198.18.0.125"
-$cmd > $tmpfile 2>> $tmpfile
-echo_result "Deleting ip 198.18.0.125" "$?" "$tmpfile" "$cmd"
-