From 6db5a2d190a67cf57be647cf20f1da2a77125985 Mon Sep 17 00:00:00 2001 From: gandalf3 Date: Thu, 6 Jul 2017 22:12:43 -0700 Subject: [PATCH] Update tests for previous commit --- tests/test_make_repo.py | 2 +- tests/test_refresh_repos.py | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/test_make_repo.py b/tests/test_make_repo.py index a3c866d..c5e741d 100644 --- a/tests/test_make_repo.py +++ b/tests/test_make_repo.py @@ -7,7 +7,7 @@ import ast import json import make_repo -logging.basicConfig(level=logging.DEBUG, +logging.basicConfig(level=logging.ERROR, format='%(levelname)8s: %(message)s') class TestRepoGeneration(unittest.TestCase): diff --git a/tests/test_refresh_repos.py b/tests/test_refresh_repos.py index 98dd42f..802b200 100644 --- a/tests/test_refresh_repos.py +++ b/tests/test_refresh_repos.py @@ -1,7 +1,7 @@ import requests import unittest from unittest import mock -from blenderpack import fetch_repo, load_repo, write_repo +# from blenderpack import Repositories, fetch_repo from datetime import datetime import json @@ -39,29 +39,29 @@ def mocked_requests_get(*args, **kwargs): return MockResponse(None, 404) -_mocked_repo_storage = {} -def mocked_load_repo(*args, **kwargs): - global _mocked_repo_storage - if args[0] not in _mocked_repo_storage: - _mocked_repo_storage[args[0]] = {'url': args[0]} +class MockRepositories: + storage = {} - return _mocked_repo_storage[args[0]] + def load(self, *args, **kwargs): + if args[0] not in self.storage: + self.storage[args[0]] = {'url': args[0]} -def mocked_write_repo(*args, **kwargs): - global _mocked_repo_storage - _mocked_repo_storage[args[0]['url']] = args[0] + return self.storage[args[0]] + + def write(self, *args, **kwargs): + self.storage[args[0]['url']] = args[0] class fetch_url_twice(unittest.TestCase): @mock.patch('requests.get', side_effect=mocked_requests_get) - @mock.patch('blenderpack.load_repo', side_effect=mocked_load_repo) - @mock.patch('blenderpack.write_repo', side_effect=mocked_write_repo) - def test_fetch(self, mock_write, mock_load, mock_get): - fetch_repo('http://someurl.tld/repo.json') + def test_fetch(self, mock_get): + self.fail('unfinished test') + repos = MockRepositories() + fetch_repo('http://someurl.tld/repo.json', repos) mock_get.assert_called_with('http://someurl.tld/repo.json', headers={}) - fetch_repo('http://someurl.tld/repo.json') + fetch_repo('http://someurl.tld/repo.json', repos) mock_get.assert_called_with('http://someurl.tld/repo.json', headers={ 'If-None-Match': '"2a0094b-b74-55326ced274f3"', 'If-Modified-Since': 'Sun, 13 Mar 2011 13:38:53 GMT'