Revision 53dbf14c test/import-export_unittest.bash

b/test/import-export_unittest.bash
67 67
  echo "$(get_testpath)/data/$1"
68 68
}
69 69

  
70
upto() {
71
  echo "$(date '+%F %T'):" "$@" '...'
72
}
73

  
70 74
statusdir=$(mktemp -d)
71 75
trap "rm -rf $statusdir" EXIT
72 76

  
......
90 94
connect_retries=1
91 95
compress=gzip
92 96

  
97
upto 'Command line parameter tests'
98

  
93 99
$impexpd >/dev/null 2>&1 &&
94 100
  err "daemon-util succeeded without parameters"
95 101

  
......
122 128
  $PYTHON $(get_testpath)/import-export_unittest-helper "$@"
123 129
}
124 130

  
125
upto() {
126
  echo "$(date '+%F %T'):" "$@" '...'
127
}
128

  
129 131
reset_status() {
130 132
  rm -f $src_statusfile $dst_output $dst_statusfile $dst_output $dst_portfile
131 133
}
......
134 136
  local fname=${1:-$testdata}
135 137

  
136 138
  # Wait for connection to be established
139
  impexpd_helper $src_statusfile connected
140

  
141
  # And just to be sure, also wait for destination to report as connected
137 142
  impexpd_helper $dst_statusfile connected
138 143

  
139 144
  cat $fname

Also available in: Unified diff