Some small test clean up changes

tests/integration/__init__.py

@@ -12,7 +12,6 @@ import sys
 import copy
 import json
 import time
-import errno
 import signal
 import shutil
 import pprint
@@ -277,9 +276,9 @@ class TestDaemon(object):
         # Wait for the daemons to all spin up
         time.sleep(5)
 
-        #smaster = salt.daemons.flo.IofloMaster(self.syndic_master_opts)
-        #self.smaster_process = multiprocessing.Process(target=smaster.start)
-        #self.smaster_process.start()
+        # smaster = salt.daemons.flo.IofloMaster(self.syndic_master_opts)
+        # self.smaster_process = multiprocessing.Process(target=smaster.start)
+        # self.smaster_process.start()
 
         # no raet syndic daemon yet
 
@@ -506,7 +505,7 @@ class TestDaemon(object):
             minion_opts['raet_port'] = 64510
             sub_minion_opts['transport'] = 'raet'
             sub_minion_opts['raet_port'] = 64520
-            #syndic_master_opts['transport'] = 'raet'
+            # syndic_master_opts['transport'] = 'raet'
 
         # Set up config options that require internal data
         master_opts['pillar_roots'] = {
@@ -697,7 +696,7 @@ class TestDaemon(object):
         sync_needed = self.parser.options.clean
         if self.parser.options.clean is False:
             def sumfile(fpath):
-                # Since we will be do'in this for small files, it should be ok
+                # Since we will be doing this for small files, it should be ok
                 fobj = fopen(fpath)
                 m = md5()
                 while True:

tests/integration/netapi/rest_cherrypy/__init__.py

@@ -1 +1 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-

tests/integration/netapi/rest_tornado/__init__.py

@@ -1 +1 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-

tests/runtests.py

@@ -191,11 +191,20 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
             os.environ['EXPENSIVE_TESTS'] = 'True'
 
         if self.options.coverage and any((
-                self.options.module, self.options.cli, self.options.client,
-                self.options.shell, self.options.unit, self.options.state,
-                self.options.runners, self.options.loader, self.options.name,
-                self.options.outputter, self.options.fileserver,
-                self.options.wheel, os.geteuid() != 0,
+                self.options.module,
+                self.options.cli,
+                self.options.client,
+                self.options.shell,
+                self.options.unit,
+                self.options.state,
+                self.options.runners,
+                self.options.loader,
+                self.options.name,
+                self.options.outputter,
+                self.options.fileserver,
+                self.options.wheel,
+                self.options.api,
+                os.geteuid() != 0,
                 not self.options.run_destructive)):
             self.error(
                 'No sense in generating the tests coverage report when '
@@ -342,6 +351,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
                  self.options.fileserver or
                  self.options.wheel or
                  self.options.cloud_provider_tests or
+                 self.options.api or
                  named_tests):
             # We're either not running any of runners, state, module and client
             # tests, or, we're only running unittests by passing --unit or by