Skip to content
Snippets Groups Projects
Commit 52bab4fd authored by Thorge Petersen's avatar Thorge Petersen
Browse files

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

parents 2c531ede 39bea49a
No related branches found
No related tags found
1 merge request!48Merge dev into master
from ckanext.odsh.tests.test_helpers import AppProxy from ckanext.odsh.tests_wip.test_helpers import AppProxy
import ckanext.odsh.tests.test_helpers as testhelpers import ckanext.odsh.tests_wip.test_helpers as testhelpers
import ckan.tests.factories as factories import ckan.tests.factories as factories
import uuid import uuid
import pdb import pdb
from ckanext.odsh.tests.harvest_sever_mock import HarvestServerMock from ckanext.odsh.tests_wip.harvest_sever_mock import HarvestServerMock
import ckanext.odsh.tests.harvest_sever_mock as harvest_sever_mock import ckanext.odsh.tests_wip.harvest_sever_mock as harvest_sever_mock
import subprocess import subprocess
import re import re
......
from ckanext.odsh.tests.test_helpers import AppProxy from ckanext.odsh.tests_wip.test_helpers import AppProxy
import ckanext.odsh.tests.test_helpers as testhelpers import ckanext.odsh.tests_wip.test_helpers as testhelpers
import ckan.tests.factories as factories import ckan.tests.factories as factories
import uuid import uuid
import pdb import pdb
from ckanext.odsh.tests.harvest_sever_mock import HarvestServerMock from ckanext.odsh.tests_wip.harvest_sever_mock import HarvestServerMock
import ckanext.odsh.tests.harvest_sever_mock as harvest_sever_mock import ckanext.odsh.tests_wip.harvest_sever_mock as harvest_sever_mock
import subprocess import subprocess
......
# coding: utf-8 # coding: utf-8
from ckanext.odsh.tests.ckan_selenium import SeleniumCkanApp from ckanext.odsh.tests_wip.ckan_selenium import SeleniumCkanApp
import pdb import pdb
import uuid import uuid
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment