From 8a62bc0561f8d867eae490e3cab125566bfc0d3c Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 19:54:11 +0800 Subject: [PATCH 01/27] add travis ci test --- .travis.yml | 13 +++++++++++++ test/travisci_test.py | 1 + 2 files changed, 14 insertions(+) create mode 100644 .travis.yml create mode 100644 test/travisci_test.py diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7f466f4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: python #语言种类 + +python: +- 2.7 +- 3.5 + +before_script: +- pip install -r requirements.txt +- pip install requests +- pip install feedparser + +script: +- python test/travisci_test.py \ No newline at end of file diff --git a/test/travisci_test.py b/test/travisci_test.py new file mode 100644 index 0000000..cb26159 --- /dev/null +++ b/test/travisci_test.py @@ -0,0 +1 @@ +print(System.getenv()) \ No newline at end of file From 258562626707e582e8afeec095667362de4970ee Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 19:58:08 +0800 Subject: [PATCH 02/27] add Environment Variables test --- test/travisci_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/travisci_test.py b/test/travisci_test.py index cb26159..f296e6b 100644 --- a/test/travisci_test.py +++ b/test/travisci_test.py @@ -1 +1 @@ -print(System.getenv()) \ No newline at end of file +print(ruokuai_name) \ No newline at end of file From a0207e52f03fc8272d585958dff81cb600248e71 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:12:45 +0800 Subject: [PATCH 03/27] add Environment Variables test 2 --- test/travisci_test.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/test/travisci_test.py b/test/travisci_test.py index f296e6b..7f79548 100644 --- a/test/travisci_test.py +++ b/test/travisci_test.py @@ -1 +1,26 @@ -print(ruokuai_name) \ No newline at end of file + + + + +try: + print(1) + print(ruokuai_name) +except Exception as e: + pass + +try: + print(2) + import sys + print(sys.argv) +except Exception as e: + pass + + +try: + print(3) + import System + System.getenv() +except Exception as e: + pass + + From a2b8bd8fe0e8ed35b20983f2dec34ef5e1948097 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:18:35 +0800 Subject: [PATCH 04/27] add Environment Variables test 3 --- test/travisci_test.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/travisci_test.py b/test/travisci_test.py index 7f79548..5a02a79 100644 --- a/test/travisci_test.py +++ b/test/travisci_test.py @@ -6,14 +6,14 @@ print(1) print(ruokuai_name) except Exception as e: - pass + print(e) try: print(2) import sys print(sys.argv) except Exception as e: - pass + print(e) try: @@ -21,6 +21,12 @@ import System System.getenv() except Exception as e: - pass + print(e) +try: + print(4) + import System + System.getenv("ruokuai_name") +except Exception as e: + print(e) From f1c90f4cf37a268cd198d9b7baf2dc7904e96f5c Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:24:03 +0800 Subject: [PATCH 05/27] add Environment Variables test 4 --- .travis.yml | 2 -- test/travisci_test.py | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f466f4..a3189db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ python: before_script: - pip install -r requirements.txt -- pip install requests -- pip install feedparser script: - python test/travisci_test.py \ No newline at end of file diff --git a/test/travisci_test.py b/test/travisci_test.py index 5a02a79..bbfac43 100644 --- a/test/travisci_test.py +++ b/test/travisci_test.py @@ -26,7 +26,7 @@ try: print(4) - import System - System.getenv("ruokuai_name") + import os + os.environ.get('ruokuai_name') except Exception as e: - print(e) + print(e) \ No newline at end of file From cd83af9599a30987a9b784075ad893f3206700ff Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:40:03 +0800 Subject: [PATCH 06/27] add Environment Variables test 5 --- .travis.yml | 1 + test/travisci_test.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a3189db..f6dd2d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,5 @@ before_script: - pip install -r requirements.txt script: +- if [[ $TEST == 123 ]]; then python test/travisci_test.py $TEST; fi - python test/travisci_test.py \ No newline at end of file diff --git a/test/travisci_test.py b/test/travisci_test.py index bbfac43..c509575 100644 --- a/test/travisci_test.py +++ b/test/travisci_test.py @@ -27,6 +27,7 @@ try: print(4) import os + os.environ[''] os.environ.get('ruokuai_name') except Exception as e: print(e) \ No newline at end of file From 158c3a83b41028e20ed406011dd155775ffb3fd9 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:44:40 +0800 Subject: [PATCH 07/27] add Environment Variables test 6 --- .travis.yml | 6 +++++- test/travisci_test.py | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6dd2d7..899eb81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,13 @@ python: - 2.7 - 3.5 +cache: + directories: + - $HOME/.cache/pip + before_script: - pip install -r requirements.txt script: -- if [[ $TEST == 123 ]]; then python test/travisci_test.py $TEST; fi +- if [[ $TEST ]]; then python test/travisci_test.py $TEST; fi - python test/travisci_test.py \ No newline at end of file diff --git a/test/travisci_test.py b/test/travisci_test.py index c509575..c5b3eb6 100644 --- a/test/travisci_test.py +++ b/test/travisci_test.py @@ -19,7 +19,7 @@ try: print(3) import System - System.getenv() + print(System.getenv()) except Exception as e: print(e) @@ -27,7 +27,7 @@ try: print(4) import os - os.environ[''] - os.environ.get('ruokuai_name') + print(os.environ['']) + print(os.environ.get('ruokuai_name')) except Exception as e: print(e) \ No newline at end of file From 42db728f30b058213e45de8f5aedb9c3bb11c421 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:48:26 +0800 Subject: [PATCH 08/27] add Environment Variables test 7 --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 899eb81..cd9ceaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: python #语言种类 +language: python python: - 2.7 @@ -8,6 +8,11 @@ cache: directories: - $HOME/.cache/pip +env: + global: + - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels + - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels + before_script: - pip install -r requirements.txt From ff9c5175407895c6825eb063128521452cc30d60 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:48:59 +0800 Subject: [PATCH 09/27] add Environment Variables test 8 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cd9ceaf..6a5dc04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ env: - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels +install: + - pip wheel -r requirements.txt + - pip install -r requirements.txt + before_script: - pip install -r requirements.txt From c9662eec3a7c1c65c483b5d03dac26e376470221 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 20:56:08 +0800 Subject: [PATCH 10/27] add Environment Variables test 9 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a5dc04..c7baa43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,4 @@ before_script: - pip install -r requirements.txt script: -- if [[ $TEST ]]; then python test/travisci_test.py $TEST; fi -- python test/travisci_test.py \ No newline at end of file +- if [[ $OCR_RUOKUAI ]]; then python test/travisci_test.py $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi \ No newline at end of file From eec069f73f650f7e0f4d8451cbd1915f94c7bb27 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 21:06:40 +0800 Subject: [PATCH 11/27] add Environment Variables test 10 --- test/travisci_test.py | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/test/travisci_test.py b/test/travisci_test.py index c5b3eb6..8612a61 100644 --- a/test/travisci_test.py +++ b/test/travisci_test.py @@ -1,33 +1,9 @@ +import sys +if sys.argv[1] == 'true': + print('ci env') - -try: - print(1) - print(ruokuai_name) -except Exception as e: - print(e) - -try: - print(2) - import sys - print(sys.argv) -except Exception as e: - print(e) - - -try: - print(3) - import System - print(System.getenv()) -except Exception as e: - print(e) - - -try: - print(4) - import os - print(os.environ['']) - print(os.environ.get('ruokuai_name')) -except Exception as e: - print(e) \ No newline at end of file +from test import config +if config.soft_key: + print('local env') \ No newline at end of file From 4850f044f2f0dc15d10b7687053aab7435831b60 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 21:11:22 +0800 Subject: [PATCH 12/27] add Environment Variables test 11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7baa43..e10128b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ before_script: - pip install -r requirements.txt script: -- if [[ $OCR_RUOKUAI ]]; then python test/travisci_test.py $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi \ No newline at end of file +- if [[ $OCR_RUOKUAI ]]; then python test/travisci_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi \ No newline at end of file From fb9a7cce6d6677b9e7d3a0df82014ee53711e706 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 21:47:10 +0800 Subject: [PATCH 13/27] use ci or local for test --- .travis.yml | 3 ++- readme.md | 29 +++++++++++++++++++++++++++++ test/api_test.py | 10 +++++----- test/env_variable.py | 24 ++++++++++++++++++++++++ test/ruokuaicode_test.py | 4 ++-- test/travisci_test.py | 9 --------- 6 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 test/env_variable.py delete mode 100644 test/travisci_test.py diff --git a/.travis.yml b/.travis.yml index e10128b..e9e241f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,5 @@ before_script: - pip install -r requirements.txt script: -- if [[ $OCR_RUOKUAI ]]; then python test/travisci_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi \ No newline at end of file +- if [[ $OCR_RUOKUAI ]]; then python test/ruokuaicode_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi +- if [[ $OCR_RUOKUAI ]]; then python test/api_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi \ No newline at end of file diff --git a/readme.md b/readme.md index d2cb41b..c56a6f9 100644 --- a/readme.md +++ b/readme.md @@ -52,6 +52,35 @@ import logging.config logging.config.fileConfig('logging.conf') logger = logging.getLogger() + +## 测试 + +测试必须使用若快打码，有两个环境可以选择。 + +### 使用本地环境测试 + +添加`test/config.py`文件： + + # ruokuai + username = '' + password = '' + soft_id = '' + soft_key = '' + +### 使用travis-ci环境测试 + +设置环境变量： + + OCR_RUOKUAI : true + + RUOKUAI_USERNAME : your_username + + RUOKUAI_PASSWORD : your_password + + RUOKUAI_SOFT_ID : your_soft_id + + RUOKUAI_SOFT_KEY : your_soft_key + ## 引用 from wechatsogou import * diff --git a/test/api_test.py b/test/api_test.py index 25a0ff8..5c4b670 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -4,17 +4,17 @@ from pprint import pprint import wechatsogou -from test import config +from test import env_variable class ApiTest(unittest.TestCase): def setUp(self): ocr_config = { 'type': 'ruokuai', - 'dama_name': config.username, - 'dama_pswd': config.password, - 'dama_soft_id': config.soft_id, - 'dama_soft_key': config.soft_key + 'dama_name': env_variable.username, + 'dama_pswd': env_variable.password, + 'dama_soft_id': env_variable.soft_id, + 'dama_soft_key': env_variable.soft_key } self.api = wechatsogou.WechatSogouApi(ocr_config=ocr_config) diff --git a/test/env_variable.py b/test/env_variable.py new file mode 100644 index 0000000..2cf6639 --- /dev/null +++ b/test/env_variable.py @@ -0,0 +1,24 @@ +ci_environment = False +try: + import sys + + if sys.argv[1] == 'true': + print('ci environment.') + ci_environment = True + username = sys.argv[2] + password = sys.argv[3] + soft_id = sys.argv[4] + soft_key = sys.argv[5] +except IndexError: + if not ci_environment: + try: + from test import config + + if config.soft_key: + print('local environment') + username = config.username + password = config.password + soft_id = config.soft_id + soft_key = config.soft_key + except ImportError: + raise Exception('This is not ci or local environment.Please read README.md') diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index c5ab7a0..a222763 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -1,12 +1,12 @@ import unittest -from test import config +from test import env_variable from wechatsogou.ruokuaicode import RClient class RuokuaicodeTest(unittest.TestCase): def test_create(self): - rc = RClient(config.username, config.password, config.soft_id, config.soft_key) + rc = RClient(env_variable.username, env_variable.password, env_variable.soft_id, env_variable.soft_key) with open('code.jpg', 'rb') as f: im = f.read() result = rc.create(im, '3060') diff --git a/test/travisci_test.py b/test/travisci_test.py deleted file mode 100644 index 8612a61..0000000 --- a/test/travisci_test.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -if sys.argv[1] == 'true': - print('ci env') - - -from test import config -if config.soft_key: - print('local env') \ No newline at end of file From bdc05f3f5f4860d24cdc2a4ff53774e69e0ad55c Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 21:58:30 +0800 Subject: [PATCH 14/27] use ci or local for test 2 --- test/1.py | 16 ++++++++++++++++ test/api_test.py | 2 +- test/env_variable.py | 2 +- test/ruokuaicode_test.py | 3 ++- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 test/1.py diff --git a/test/1.py b/test/1.py new file mode 100644 index 0000000..74aa6ae --- /dev/null +++ b/test/1.py @@ -0,0 +1,16 @@ +import unittest + +from test import env_variable +from wechatsogou.ruokuaicode import RClient + + + +s = env_variable +rc = RClient(env_variable.username, env_variable.password, env_variable.soft_id, env_variable.soft_key) +with open('code.jpg', 'rb') as f: + im = f.read() +result = rc.create(im, '3060') +result_str = result['Result'].lower() +assert result_str == '61xmv3' + + diff --git a/test/api_test.py b/test/api_test.py index 5c4b670..2bb3d57 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -4,7 +4,7 @@ from pprint import pprint import wechatsogou -from test import env_variable +import env_variable class ApiTest(unittest.TestCase): diff --git a/test/env_variable.py b/test/env_variable.py index 2cf6639..506d9f2 100644 --- a/test/env_variable.py +++ b/test/env_variable.py @@ -12,7 +12,7 @@ except IndexError: if not ci_environment: try: - from test import config + import config if config.soft_key: print('local environment') diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index a222763..f3a2ce2 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -1,11 +1,12 @@ import unittest -from test import env_variable +import env_variable from wechatsogou.ruokuaicode import RClient class RuokuaicodeTest(unittest.TestCase): def test_create(self): + s = env_variable rc = RClient(env_variable.username, env_variable.password, env_variable.soft_id, env_variable.soft_key) with open('code.jpg', 'rb') as f: im = f.read() From 112aa12c4118089f9d07d1c34148deef219d6716 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 22:00:56 +0800 Subject: [PATCH 15/27] use ci or local for test 3 --- test/api_test.py | 4 ++-- test/ruokuaicode_test.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/api_test.py b/test/api_test.py index 2bb3d57..b1a2c11 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -2,8 +2,8 @@ import unittest from pprint import pprint - -import wechatsogou +from .. import wechatsogou +# import wechatsogou import env_variable diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index f3a2ce2..790a6dc 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -1,7 +1,8 @@ import unittest import env_variable -from wechatsogou.ruokuaicode import RClient +# from .. import wechatsogou +from ..wechatsogou.ruokuaicode import RClient class RuokuaicodeTest(unittest.TestCase): From 0d7a73b13e2bc5c142d83cbd8bb5ce1aba320edd Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 22:03:16 +0800 Subject: [PATCH 16/27] use ci or local for test 4 --- .travis.yml | 1 + test/api_test.py | 4 ++-- test/ruokuaicode_test.py | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9e241f..6e6364a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ install: before_script: - pip install -r requirements.txt +- pip install wechatsogou script: - if [[ $OCR_RUOKUAI ]]; then python test/ruokuaicode_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi diff --git a/test/api_test.py b/test/api_test.py index b1a2c11..2bb3d57 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -2,8 +2,8 @@ import unittest from pprint import pprint -from .. import wechatsogou -# import wechatsogou + +import wechatsogou import env_variable diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index 790a6dc..f3a2ce2 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -1,8 +1,7 @@ import unittest import env_variable -# from .. import wechatsogou -from ..wechatsogou.ruokuaicode import RClient +from wechatsogou.ruokuaicode import RClient class RuokuaicodeTest(unittest.TestCase): From 5545a1eac962c0adc082e8ebcac13c5339fe6918 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 22:07:37 +0800 Subject: [PATCH 17/27] use ci or local for test 5 --- test/ruokuaicode_test.py | 2 +- wechatsogou/__init__.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index f3a2ce2..1c2c216 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -1,7 +1,7 @@ import unittest import env_variable -from wechatsogou.ruokuaicode import RClient +from wechatsogou import RClient class RuokuaicodeTest(unittest.TestCase): diff --git a/wechatsogou/__init__.py b/wechatsogou/__init__.py index 3cecd94..3064ced 100644 --- a/wechatsogou/__init__.py +++ b/wechatsogou/__init__.py @@ -2,7 +2,8 @@ from .api import WechatSogouApi from .filecache import WechatCache +from .ruokuaicode import RClient -__all__ = ['WechatSogouApi', 'WechatCache'] +__all__ = ['WechatSogouApi', 'WechatCache', 'RClient'] -__version__ = "2.0.1" +__version__ = "2.0.2" From 3231b366e3d09adeacb23fbd6365a78514dfa67a Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 22:10:54 +0800 Subject: [PATCH 18/27] use ci or local for test 6 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e6364a..0062ff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,7 @@ install: - pip install -r requirements.txt before_script: -- pip install -r requirements.txt -- pip install wechatsogou +- pip install wechatsogou==2.0.2 script: - if [[ $OCR_RUOKUAI ]]; then python test/ruokuaicode_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi From ee7980408ffa0c0c413f7aa085645d67b2614c0e Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 22:18:37 +0800 Subject: [PATCH 19/27] use ci or local for test 7 --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0062ff5..4d503cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,21 +4,21 @@ python: - 2.7 - 3.5 -cache: - directories: - - $HOME/.cache/pip +#cache: +# directories: +# - $HOME/.cache/pip -env: - global: - - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels - - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels +#env: +# global: +# - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels +# - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels install: - - pip wheel -r requirements.txt +# - pip wheel -r requirements.txt - pip install -r requirements.txt before_script: -- pip install wechatsogou==2.0.2 +- pip install wechatsogou==2.0.3 script: - if [[ $OCR_RUOKUAI ]]; then python test/ruokuaicode_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi From 0b53ef7944ff01e63006cd7e0df6d619b02bdc8c Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 22:48:03 +0800 Subject: [PATCH 20/27] use ci or local for test 8 --- .travis.yml | 20 ++++++++++---------- test/api_test.py | 2 ++ test/ruokuaicode_test.py | 3 ++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d503cc..a095323 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,21 +4,21 @@ python: - 2.7 - 3.5 -#cache: -# directories: -# - $HOME/.cache/pip +cache: + directories: + - $HOME/.cache/pip -#env: -# global: -# - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels -# - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels +env: + global: + - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels + - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels install: -# - pip wheel -r requirements.txt + - pip wheel -r requirements.txt - pip install -r requirements.txt -before_script: -- pip install wechatsogou==2.0.3 +#before_script: +#- pip install wechatsogou== script: - if [[ $OCR_RUOKUAI ]]; then python test/ruokuaicode_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi diff --git a/test/api_test.py b/test/api_test.py index 2bb3d57..17f1a45 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- +import sys import unittest from pprint import pprint +sys.path.append('../') import wechatsogou import env_variable diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index 1c2c216..8800e4b 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -1,12 +1,13 @@ +import sys import unittest +sys.path.append('../') import env_variable from wechatsogou import RClient class RuokuaicodeTest(unittest.TestCase): def test_create(self): - s = env_variable rc = RClient(env_variable.username, env_variable.password, env_variable.soft_id, env_variable.soft_key) with open('code.jpg', 'rb') as f: im = f.read() From d72b07515dd0da845a8ac8252a409d102a5ba8f1 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 22:53:19 +0800 Subject: [PATCH 21/27] use ci or local for test 9 --- test/api_test.py | 2 +- test/ruokuaicode_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/api_test.py b/test/api_test.py index 17f1a45..80fd694 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -5,7 +5,7 @@ from pprint import pprint sys.path.append('../') -import wechatsogou +import ..wechatsogou import env_variable diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index 8800e4b..b080d69 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -3,7 +3,7 @@ sys.path.append('../') import env_variable -from wechatsogou import RClient +from ..wechatsogou import RClient class RuokuaicodeTest(unittest.TestCase): From d20975bae3b0c2dffd395727d2fe17b0a817c6c0 Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 23:06:54 +0800 Subject: [PATCH 22/27] use ci or local for test 10 --- test/api_test.py | 4 ++-- test/ruokuaicode_test.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/api_test.py b/test/api_test.py index 80fd694..9de2033 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -4,8 +4,8 @@ import unittest from pprint import pprint -sys.path.append('../') -import ..wechatsogou +sys.path.append('..') +import wechatsogou import env_variable diff --git a/test/ruokuaicode_test.py b/test/ruokuaicode_test.py index b080d69..00adc65 100644 --- a/test/ruokuaicode_test.py +++ b/test/ruokuaicode_test.py @@ -1,9 +1,9 @@ import sys import unittest -sys.path.append('../') +sys.path.append('..') import env_variable -from ..wechatsogou import RClient +from wechatsogou import RClient class RuokuaicodeTest(unittest.TestCase): From b280974031a7d0f131e061c4bdea30c4434c55ad Mon Sep 17 00:00:00 2001 From: Chyroc Chen Date: Sun, 18 Dec 2016 23:19:30 +0800 Subject: [PATCH 23/27] use ci or local for test 11 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a095323..4f8e467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,9 @@ install: - pip wheel -r requirements.txt - pip install -r requirements.txt -#before_script: -#- pip install wechatsogou== +before_script: +#- pip install wechatsogou +- export PYTHONPATH=$PYTHONPATH:$(pwd) script: - if [[ $OCR_RUOKUAI ]]; then python test/ruokuaicode_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi From 246501927db67fdb6008d80be093ee0b0f1c4d0b Mon Sep 17 00:00:00 2001 From: Chyroc Date: Fri, 24 Mar 2017 20:05:27 +0800 Subject: [PATCH 24/27] test --- .travis.yml | 5 +--- test/1.py | 16 ----------- test/TestOne.py | 10 +++++++ test/api_test.py | 59 --------------------------------------- test/code.jpg | Bin 2600 -> 0 bytes test/env_variable.py | 24 ---------------- test/ruokuaicode_test.py | 18 ------------ 7 files changed, 11 insertions(+), 121 deletions(-) delete mode 100644 test/1.py create mode 100644 test/TestOne.py delete mode 100644 test/api_test.py delete mode 100644 test/code.jpg delete mode 100644 test/env_variable.py delete mode 100644 test/ruokuaicode_test.py diff --git a/.travis.yml b/.travis.yml index 5a74067..e893f28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,12 +13,9 @@ env: - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels install: - - pip wheel -r requirements.txt - pip install -r requirements.txt before_script: - export PYTHONPATH=$PYTHONPATH:$(pwd) -script: -#- if [[ $OCR_RUOKUAI ]]; then python test/ruokuaicode_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi -#- if [[ $OCR_RUOKUAI ]]; then python test/api_test.py $OCR_RUOKUAI $RUOKUAI_USERNAME $RUOKUAI_PASSWORD $RUOKUAI_SOFT_ID $RUOKUAI_SOFT_KEY; fi \ No newline at end of file +script: pytest \ No newline at end of file diff --git a/test/1.py b/test/1.py deleted file mode 100644 index 74aa6ae..0000000 --- a/test/1.py +++ /dev/null @@ -1,16 +0,0 @@ -import unittest - -from test import env_variable -from wechatsogou.ruokuaicode import RClient - - - -s = env_variable -rc = RClient(env_variable.username, env_variable.password, env_variable.soft_id, env_variable.soft_key) -with open('code.jpg', 'rb') as f: - im = f.read() -result = rc.create(im, '3060') -result_str = result['Result'].lower() -assert result_str == '61xmv3' - - diff --git a/test/TestOne.py b/test/TestOne.py new file mode 100644 index 0000000..781b0c5 --- /dev/null +++ b/test/TestOne.py @@ -0,0 +1,10 @@ +import unittest + + +class TestOne(unittest.TestCase): + def test_for_fun(self): + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/test/api_test.py b/test/api_test.py deleted file mode 100644 index 9de2033..0000000 --- a/test/api_test.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- - -import sys -import unittest -from pprint import pprint - -sys.path.append('..') -import wechatsogou -import env_variable - - -class ApiTest(unittest.TestCase): - def setUp(self): - ocr_config = { - 'type': 'ruokuai', - 'dama_name': env_variable.username, - 'dama_pswd': env_variable.password, - 'dama_soft_id': env_variable.soft_id, - 'dama_soft_key': env_variable.soft_key - } - self.api = wechatsogou.WechatSogouApi(ocr_config=ocr_config) - - def test_search_gzh_info(self): - name = '南京航空航天大学' - wechat_infos = self.api.search_gzh_info(name) - wechat_name = [wechat_info['name'] for wechat_info in wechat_infos] - assert name in wechat_name - - def test_get_gzh_info(self): - wechat_id = 'nanhangqinggong' - wechat_info = self.api.get_gzh_info(wechat_id) - assert '南航青年志愿者' == wechat_info['name'] - - def test_search_article_info(self): - keywords = '马达数据与虎嗅F&M节的亲密接触' - wechat_articles = self.api.search_article_info(keywords) - times = [wechat_article['article']['time'] for wechat_article in wechat_articles] - names = [wechat_article['gzh']['name'] for wechat_article in wechat_articles] - assert 1481244814 in times - assert '马达数据' in names - - def test_get_gzh_message(self): - data = self.api.get_gzh_message(wechatid='madadata') - assert len(data) > 2 - assert len(data[0]['title']) > 2 - - def test_get_gzh_message_and_info(self): - data_all = self.api.get_gzh_message_and_info(wechatid='madadata') - assert '北京马达加科技有限公司' == data_all['gzh_info']['authentication'] - assert len(data_all['gzh_messages']) > 2 - assert len(data_all['gzh_messages'][0]['title']) > 2 - - def test_get_recent_article_url_by_index_single(self): - articles_single = self.api.get_recent_article_url_by_index_single() - assert len(articles_single) == 20 - - -if __name__ == '__main__': - unittest.main() diff --git a/test/code.jpg b/test/code.jpg deleted file mode 100644 index dda164fcfa507274d9777cfb70e38d895f5be15b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2600 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 hm8_qvb8l Date: Fri, 24 Mar 2017 20:43:58 +0800 Subject: [PATCH 25/27] fix test --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e893f28..a403131 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ install: - pip install -r requirements.txt before_script: -- export PYTHONPATH=$PYTHONPATH:$(pwd) + - export PYTHONPATH=$PYTHONPATH:$(pwd) -script: pytest \ No newline at end of file +script: + - python -m nose -vs \ No newline at end of file From 5eae00da3151f70ae02de3643b10ef401d716b6c Mon Sep 17 00:00:00 2001 From: Chyroc Date: Fri, 24 Mar 2017 21:53:23 +0800 Subject: [PATCH 26/27] test --- readme.md | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/readme.md b/readme.md index c56a6f9..3b1134d 100644 --- a/readme.md +++ b/readme.md @@ -53,34 +53,6 @@ logging.config.fileConfig('logging.conf') logger = logging.getLogger() -## 测试 - -测试必须使用若快打码，有两个环境可以选择。 - -### 使用本地环境测试 - -添加`test/config.py`文件： - - # ruokuai - username = '' - password = '' - soft_id = '' - soft_key = '' - -### 使用travis-ci环境测试 - -设置环境变量： - - OCR_RUOKUAI : true - - RUOKUAI_USERNAME : your_username - - RUOKUAI_PASSWORD : your_password - - RUOKUAI_SOFT_ID : your_soft_id - - RUOKUAI_SOFT_KEY : your_soft_key - ## 引用 from wechatsogou import * From e0bfb0a5295e2fcf78526d5b3f9e5bf6d9d07ef4 Mon Sep 17 00:00:00 2001 From: Chyroc Date: Fri, 24 Mar 2017 22:06:43 +0800 Subject: [PATCH 27/27] change package --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b62eff3..4a86b1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ Flask==0.12 lxml==3.7.0 -MarkupSafe==0.23 +MarkupSafe==1.0 nose==1.3.7 Pillow==3.4.2 requests==2.13.0 six==1.10.0 Werkzeug==0.12.1 xlrd==1.0.0 -zope.interface==4.3.2 +zope.interface==4.3.3