"""Unit test suite for HXL proxy."""

import os
import re
import hxl
import unittest.mock

TEST_DATA_FILE = os.path.join(os.path.dirname(__file__), 'test-data.sql')

#
# Mock URL access for local testing
#

def mock_open_url(url, allow_local=False, timeout=None, verify=True):
    """
    Open local files instead of URLs.
    If it's a local file path, leave it alone; otherwise,
    open as a file under ./files/

    This is meant as a side effect for unittest.mock.Mock
    """
    if re.match(r'https?:', url):
        # Looks like a URL
        filename = re.sub(r'^.*/([^/]+)$', '\\1', url)
        path = resolve_path('files/' + filename)
    else:
        # Assume it's a file
        path = url
    return (open(path, 'rb'), None, None, None)

def resolve_path(filename):
    """Resolve a relative path against this module's directory."""
    return os.path.join(os.path.dirname(__file__), filename)

# Target function to replace for mocking URL access.
URL_MOCK_TARGET = 'hxl.io.open_url_or_file'

# Mock object to replace hxl.io.make_stream
URL_MOCK_OBJECT = unittest.mock.Mock()
URL_MOCK_OBJECT.side_effect = mock_open_url

# end

"""Unit test suite for HXL proxy."""

import os
import re
import hxl
import unittest.mock

TEST_DATA_FILE = os.path.join(os.path.dirname(__file__), 'test-data.sql')

#
# Mock URL access for local testing
#

def mock_open_url(url, allow_local=False, timeout=None, verify=True):
    """
    Open local files instead of URLs.
    If it's a local file path, leave it alone; otherwise,
    open as a file under ./files/

    This is meant as a side effect for unittest.mock.Mock
    """
    if re.match(r'https?:', url):
        # Looks like a URL
        filename = re.sub(r'^.*/([^/]+)$', '\\1', url)
        path = resolve_path('files/' + filename)
    else:
        # Assume it's a file
        path = url
    return open(path, 'rb')

def resolve_path(filename):
    """Resolve a relative path against this module's directory."""
    return os.path.join(os.path.dirname(__file__), filename)

# Target function to replace for mocking URL access.
URL_MOCK_TARGET = 'hxl.io.open_url_or_file'

# Mock object to replace hxl.io.make_stream
URL_MOCK_OBJECT = unittest.mock.Mock()
URL_MOCK_OBJECT.side_effect = mock_open_url

# end

--- 
+++ 
@@ -26,7 +26,7 @@
     else:
         # Assume it's a file
         path = url
-    return open(path, 'rb')
+    return (open(path, 'rb'), None, None, None)
 
 def resolve_path(filename):
     """Resolve a relative path against this module's directory."""
Update mock method to match changed return value for libhxl
