fix bug: mod_watch restart service in test mode
fix pep8
Merge pull request #3617 from giantlock/develop

fix bug: mod_watch restart service in test mode