Jaap Marcus 3 лет назад
Родитель
Сommit
12dbe4b6db
2 измененных файлов с 0 добавлено и 162 удалено
  1. 0 105
      test/json.sh
  2. 0 57
      test/test_json_listing.sh

+ 0 - 105
test/json.sh

@@ -1,105 +0,0 @@
-# https://github.com/dominictarr/JSON.sh
-# Code is licensed under the MIT license
-# Copyright (c) 2011 Dominic Tarr
-
-throw () {
-  echo "$*" >&2
-  exit 1
-}
-
-tokenize () {
-  local ESCAPE='(\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
-  local CHAR='[^[:cntrl:]"\\]'
-  local STRING="\"$CHAR*($ESCAPE$CHAR*)*\""
-  local NUMBER='-?(0|[1-9][0-9]*)([.][0-9]*)?([eE][+-]?[0-9]*)?'
-  local KEYWORD='null|false|true'
-  local SPACE='[[:space:]]+'
-  egrep -ao "$STRING|$NUMBER|$KEYWORD|$SPACE|." --color=never |
-    egrep -v "^$SPACE$"  # eat whitespace
-}
-
-parse_array () {
-  local index=0
-  local ary=''
-  read -r token
-  case "$token" in
-    ']') ;;
-    *)
-      while :
-      do
-        parse_value "$1" "$index"
-        let index=$index+1
-        ary="$ary""$value" 
-        read -r token
-        case "$token" in
-          ']') break ;;
-          ',') ary="$ary," ;;
-          *) throw "EXPECTED , or ] GOT ${token:-EOF}" ;;
-        esac
-        read -r token
-      done
-      ;;
-  esac
-  value=`printf '[%s]' $ary`
-}
-
-parse_object () {
-  local key
-  local obj=''
-  read -r token
-  case "$token" in
-    '}') ;;
-    *)
-      while :
-      do
-        case "$token" in
-          '"'*'"') key=$token ;;
-          *) throw "EXPECTED string GOT ${token:-EOF}" ;;
-        esac
-        read -r token
-        case "$token" in
-          ':') ;;
-          *) throw "EXPECTED : GOT ${token:-EOF}" ;;
-        esac
-        read -r token
-        parse_value "$1" "$key"
-        obj="$obj$key:$value"        
-        read -r token
-        case "$token" in
-          '}') break ;;
-          ',') obj="$obj," ;;
-          *) throw "EXPECTED , or } GOT ${token:-EOF}" ;;
-        esac
-        read -r token
-      done
-    ;;
-  esac
-  value=`printf '{%s}' "$obj"`
-}
-
-parse_value () {
-  local jpath="${1:+$1,}$2"
-  case "$token" in
-    '{') parse_object "$jpath" ;;
-    '[') parse_array  "$jpath" ;;
-    # At this point, the only valid single-character tokens are digits.
-    ''|[^0-9]) throw "EXPECTED value GOT ${token:-EOF}" ;;
-    *) value=$token ;;
-  esac
-  printf "[%s]\t%s\n" "$jpath" "$value"
-}
-
-parse () {
-  read -r token
-  parse_value
-  read -r token
-  case "$token" in
-    '') ;;
-    *) throw "EXPECTED EOF GOT $token" ;;
-  esac
-}
-
-if [ $0 = $BASH_SOURCE ];
-then
-  tokenize | parse
-fi

+ 0 - 57
test/test_json_listing.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-
-source /etc/profile.d/hestia.sh
-
-V_BIN="$HESTIA/bin"
-V_TEST="$HESTIA/test"
-
-commands='v_list_cron_jobs admin json
-v_list_databases admin json
-v_list_database admin admin_hestia json
-v_list_database_server mysql localhost json
-v_list_database_servers mysql json
-v_list_dns_domains admin json
-v_list_mail_domains admin json
-v_list_dns_templates json
-v_list_mail_domains admin json
-v_list_sys_config json
-v_list_sys_interfaces json
-v_list_sys_ips json
-v_list_sys_rrd json
-v_list_user admin json
-v_list_user_backups admin json
-v_list_user_ips admin json
-v_list_user_ns admin json
-v_list_user_packages json
-v_list_users json
-v_list_web_domains admin json
-v_list_web_domain admin default.hestia.domain json
-v_list_web_templates admin json
-v_list_web_templates_nginx admin json'
-
-IFS=$'\n'
-for cmd in $commands; do
-    script=$(echo $cmd |cut -f 1 -d ' ')
-    arg1=$(echo $cmd |cut -f 2 -d ' ')
-    arg2=$(echo $cmd |cut -f 3 -d ' ')
-    arg3=$(echo $cmd |cut -f 4 -d ' ')
-    $V_BIN/$script $arg1 $arg2 $arg3 | $V_TEST/json.sh >/dev/null 2>/dev/null
-    retval="$?"
-    echo -en  "$cmd"
-    echo -en '\033[60G'
-    echo -n '['
-
-    if [ "$retval" -ne 0 ]; then
-        echo -n 'FAILED'
-        echo -n ']'
-        echo -ne '\r\n'
-        $V_BIN/$script $arg1 $arg2 $arg3 | $V_TEST/json.sh
-    else
-        echo -n '  OK  '
-        echo -n ']'
-    fi
-    echo -ne '\r\n'
-
-done
-
-exit