Merge branch '58-remove-tpsh-specific-code' into dev

ckanext/odsh/tests_wip/test_datarequest.py

 
-from ckanext.odsh.tests.test_helpers import AppProxy
-import ckanext.odsh.tests.test_helpers as testhelpers
+from ckanext.odsh.tests_wip.test_helpers import AppProxy
+import ckanext.odsh.tests_wip.test_helpers as testhelpers
 import ckan.tests.factories as factories
 import uuid
 import pdb
-from ckanext.odsh.tests.harvest_sever_mock import HarvestServerMock
-import ckanext.odsh.tests.harvest_sever_mock as harvest_sever_mock
+from ckanext.odsh.tests_wip.harvest_sever_mock import HarvestServerMock
+import ckanext.odsh.tests_wip.harvest_sever_mock as harvest_sever_mock
 import subprocess
 import re
 

ckanext/odsh/tests_wip/test_harvest.py

-from ckanext.odsh.tests.test_helpers import AppProxy
-import ckanext.odsh.tests.test_helpers as testhelpers
+from ckanext.odsh.tests_wip.test_helpers import AppProxy
+import ckanext.odsh.tests_wip.test_helpers as testhelpers
 import ckan.tests.factories as factories
 import uuid
 import pdb
-from ckanext.odsh.tests.harvest_sever_mock import HarvestServerMock
-import ckanext.odsh.tests.harvest_sever_mock as harvest_sever_mock
+from ckanext.odsh.tests_wip.harvest_sever_mock import HarvestServerMock
+import ckanext.odsh.tests_wip.harvest_sever_mock as harvest_sever_mock
 import subprocess
 
 

ckanext/odsh/tests_wip/test_selenium.py

 # coding: utf-8
 
-from ckanext.odsh.tests.ckan_selenium import SeleniumCkanApp
+from ckanext.odsh.tests_wip.ckan_selenium import SeleniumCkanApp
 import pdb
 import uuid