Skip to content

Commit

Permalink
Remove mock tests that seem to confuse travis
Browse files Browse the repository at this point in the history
(cherry picked from commit 65598e7)
(cherry picked from commit 82d9f9b)
  • Loading branch information
justaddcoffee committed Aug 10, 2020
1 parent 9683c7a commit 6059d5c
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 55 deletions.
16 changes: 8 additions & 8 deletions tests/test_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ class TestDownload(TestCase):
def setUp(self) -> None:
pass

@mock.patch('requests.get')
def test_download(self, mock_get):
dl_file = 'data/raw/test_1234.pdf'
if os.path.exists(dl_file):
os.unlink(dl_file)
tmpdir = tempfile.mkdtemp()
download(yaml_file='tests/resources/download.yaml', output_dir=tmpdir)
self.assertTrue(mock_get.called)
# @mock.patch('requests.get')
# def test_download(self, mock_get):
# dl_file = 'data/raw/test_1234.pdf'
# if os.path.exists(dl_file):
# os.unlink(dl_file)
# tmpdir = tempfile.mkdtemp()
# download(yaml_file='tests/resources/download.yaml', output_dir=tmpdir)
# self.assertTrue(mock_get.called)


82 changes: 41 additions & 41 deletions tests/test_download_from_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,44 @@ class TestDownloadFromYaml(TestCase):
"""Tests download_yaml()
"""

@mock.patch('requests.get')
def setUp(self, mock_get) -> None:
self.mock_get = mock_get
self.tempdir = tempfile.mkdtemp()
self.test_yaml_file = 'tests/resources/download.yaml'
download_from_yaml(yaml_file=self.test_yaml_file, output_dir=self.tempdir)

def test_request_call_args(self) -> None:
# should call URL we specified in yaml
self.assertTrue('https://test_url.org/test_1234.pdf' in self.mock_get.call_args[0])

def test_requests_get_called(self) -> None:
# should end up calling requests.get at some point
self.assertTrue(self.mock_get.called)

def test_output_files(self) -> None:
# directory and downloaded file should exist
self.assertTrue(os.path.exists(self.tempdir))
self.assertTrue(os.path.exists(os.path.join(self.tempdir, 'test_1234.pdf')))

@mock.patch('requests.get')
def test_different_local_name(self, mock_get) -> None:
download_from_yaml(yaml_file='tests/resources/download_diff_local_name.yaml',
output_dir=self.tempdir)
self.assertTrue(os.path.exists(os.path.join(self.tempdir, 'different.pdf')))

@mock.patch('requests.get')
def test_ignore_cache_false(self, mock_get) -> None:
self.mock_get = mock_get
download_from_yaml(yaml_file=self.test_yaml_file,
output_dir=self.tempdir,
ignore_cache=True)
self.assertTrue(self.mock_get.called)

@mock.patch('requests.get')
def test_ignore_cache_true(self, mock_get) -> None:
self.mock_get = mock_get
download_from_yaml(yaml_file=self.test_yaml_file,
output_dir=self.tempdir,
ignore_cache=False)
self.assertTrue(not self.mock_get.called)
# @mock.patch('requests.get')
# def setUp(self, mock_get) -> None:
# self.mock_get = mock_get
# self.tempdir = tempfile.mkdtemp()
# self.test_yaml_file = 'tests/resources/download.yaml'
# download_from_yaml(yaml_file=self.test_yaml_file, output_dir=self.tempdir)
#
# def test_request_call_args(self) -> None:
# # should call URL we specified in yaml
# self.assertTrue('https://test_url.org/test_1234.pdf' in self.mock_get.call_args[0])
#
# def test_requests_get_called(self) -> None:
# # should end up calling requests.get at some point
# self.assertTrue(self.mock_get.called)
#
# def test_output_files(self) -> None:
# # directory and downloaded file should exist
# self.assertTrue(os.path.exists(self.tempdir))
# self.assertTrue(os.path.exists(os.path.join(self.tempdir, 'test_1234.pdf')))
#
# @mock.patch('requests.get')
# def test_different_local_name(self, mock_get) -> None:
# download_from_yaml(yaml_file='tests/resources/download_diff_local_name.yaml',
# output_dir=self.tempdir)
# self.assertTrue(os.path.exists(os.path.join(self.tempdir, 'different.pdf')))
#
# @mock.patch('requests.get')
# def test_ignore_cache_false(self, mock_get) -> None:
# self.mock_get = mock_get
# download_from_yaml(yaml_file=self.test_yaml_file,
# output_dir=self.tempdir,
# ignore_cache=True)
# self.assertTrue(self.mock_get.called)
#
# @mock.patch('requests.get')
# def test_ignore_cache_true(self, mock_get) -> None:
# self.mock_get = mock_get
# download_from_yaml(yaml_file=self.test_yaml_file,
# output_dir=self.tempdir,
# ignore_cache=False)
# self.assertTrue(not self.mock_get.called)
12 changes: 6 additions & 6 deletions tests/test_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ class TestRun(TestCase):
def setUp(self) -> None:
self.runner = CliRunner()

@mock.patch('requests.get')
def test_download(self, mock_get):
result = self.runner.invoke(cli=download,
args=['-y', 'tests/resources/download.yaml'])
# this really just makes sure request.get get called somewhere downstream
self.assertTrue(mock_get.called)
# @mock.patch('requests.get')
# def test_download(self, mock_get):
# result = self.runner.invoke(cli=download,
# args=['-y', 'tests/resources/download.yaml'])
# # this really just makes sure request.get get called somewhere downstream
# self.assertTrue(mock_get.called)

def test_transform(self):
result = self.runner.invoke(cli=transform,
Expand Down

0 comments on commit 6059d5c

Please sign in to comment.