Windows test fixes

Author: David Noble

examples/searchcommands_app/setup.py

@@ -320,7 +320,7 @@ def run(self):
             os.mkdir(packages)
 
         splunklib = os.path.join(packages, 'splunklib')
-        source = os.path.join(project_dir, '..', '..', 'splunklib')
+        source = os.path.normpath(os.path.join(project_dir, '..', '..', 'splunklib'))
 
         if os.path.islink(splunklib):
             os.remove(splunklib)

splunklib/searchcommands/internals.py

@@ -290,7 +290,7 @@ def validate_configuration_setting(specification, name, value):
             supporting_protocols=[1]),
         'maxinputs': specification(
             type=int,
-            constraint=lambda value: 0 <= value <= sys.maxsize,
+            constraint=lambda value: 0 <= value <= sys.maxint,
             supporting_protocols=[2]),
         'overrides_timeorder': specification(
             type=bool,

splunklib/searchcommands/validators.py

@@ -122,9 +122,10 @@ class File(Validator):
     """ Validates file option values.
 
     """
-    def __init__(self, mode='rt', buffering=None):
+    def __init__(self, mode='rt', buffering=None, directory=None):
         self.mode = mode
         self.buffering = buffering
+        self.directory = File._var_run_splunk if directory is None else directory
 
     def __call__(self, value):
 
@@ -134,7 +135,7 @@ def __call__(self, value):
         path = unicode(value)
 
         if not os.path.isabs(path):
-            path = os.path.join(File._var_run_splunk, path)
+            path = os.path.join(self.directory, path)
 
         try:
             value = open(path, self.mode) if self.buffering is None else open(path, self.mode, self.buffering)

tests/searchcommands/test_decorators.py

@@ -419,14 +419,14 @@ def test_option(self):
 
         expected = (
             'foo="f" boolean="f" code="foo == \\"bar\\"" duration="24:59:59" fieldname="some.field_name" '
-            'file="' + __file__ + '" integer="100" map="foo" match="123-45-6789" optionname="some_option_name" '
-            'record="f" regularexpression="\\\\s+" required_boolean="f" required_code="foo == \\"bar\\"" '
-            'required_duration="24:59:59" required_fieldname="some.field_name" required_file="' + __file__ + '" '
-            'required_integer="100" required_map="foo" required_match="123-45-6789" '
-            'required_optionname="some_option_name" required_regularexpression="\\\\s+" required_set="bar" set="bar" '
-            'show_configuration="f"')
-
-        observed = str(command.options)
+            'file=' + json_encode_string(__file__) + ' integer="100" map="foo" match="123-45-6789" '
+            'optionname="some_option_name" record="f" regularexpression="\\\\s+" required_boolean="f" '
+            'required_code="foo == \\"bar\\"" required_duration="24:59:59" required_fieldname="some.field_name" '
+            'required_file=' + json_encode_string(__file__) + ' required_integer="100" required_map="foo" '
+            'required_match="123-45-6789" required_optionname="some_option_name" required_regularexpression="\\\\s+" '
+            'required_set="bar" set="bar" show_configuration="f"')
+
+        observed = unicode(command.options)
 
         self.assertEqual(observed, expected)
         return

tests/testlib.py

@@ -246,11 +246,19 @@ def setUp(self):
         logging.debug("Connected to splunkd version %s", '.'.join(str(x) for x in self.service.splunk_version))
 
     def tearDown(self):
+        from urllib2 import HTTPError
+
         if self.service.restart_required:
             self.fail("Test left Splunk in a state requiring a restart.")
+
         for appName in self.installedApps:
             if appName in self.service.apps:
-                self.service.apps.delete(appName)
+                try:
+                    self.service.apps.delete(appName)
+                except HTTPError as error:
+                    print error
+                    pass
                 wait(lambda: appName not in self.service.apps)
+
         if self.service.restart_required:
             self.clear_restart_message()