Revision 13cc7b84 test/py/daemon-util_unittest.bash

b/test/py/daemon-util_unittest.bash
32 32
  err "Please update $0, confd enable feature is missing"
33 33
fi
34 34

  
35
if ! grep -q '^ENABLE_MOND = ' lib/_autoconf.py; then
36
  err "Please update $0, mond enable feature is missing"
37
fi
38

  
39
DAEMONS_LIST="noded masterd rapi"
40
STOPDAEMONS_LIST="rapi masterd noded"
41

  
35 42
if grep -q '^ENABLE_CONFD = True' lib/_autoconf.py; then
36
  DAEMONS="$(echo ganeti-{noded,masterd,rapi,confd})"
37
  STOPDAEMONS="$(echo ganeti-{confd,rapi,masterd,noded})"
38
else
39
  DAEMONS="$(echo ganeti-{noded,masterd,rapi})"
40
  STOPDAEMONS="$(echo ganeti-{rapi,masterd,noded})"
43
  DAEMONS_LIST="$DAEMONS_LIST confd"
44
  STOPDAEMONS_LIST="confd $STOPDAEMONS_LIST"
41 45
fi
42 46

  
47
if grep -q '^ENABLE_MOND = True' lib/_autoconf.py; then
48
  DAEMONS_LIST="$DAEMONS_LIST mond"
49
  STOPDAEMONS_LIST="mond $STOPDAEMONS_LIST"
50
fi
51

  
52
DAEMONS=$(echo $(for d in $DAEMONS_LIST; do echo "ganeti-$d"; done))
53
STOPDAEMONS=$(echo $(for d in $STOPDAEMONS_LIST; do echo "ganeti-$d"; done))
54

  
43 55
$daemon_util >/dev/null 2>&1 &&
44 56
  err "daemon-util succeeded without command"
45 57

  

Also available in: Unified diff