David Read
60c4371df4
Add "not modified" to the stats always returned.
2015-11-17 12:45:00 +00:00
David Read
ae7c500745
Merge branch 'master' into yhteentoimivuuspalvelut-job-reporting-fixes
2015-11-17 12:35:59 +00:00
Stefan Oderbolz
8e02aedc65
Fix tests
2015-11-17 13:29:25 +01:00
Stefan Oderbolz
f9b87fff0c
Make sure all possible status are always returned
...
It makes it harded to parse the API response if you always have to check
if 'deleted' is set and if what value it has. I think to simply return 0
for all status value is good practice.
2015-11-17 11:43:11 +01:00
Raphael Stolt
084723abb7
Catch JSONDecodeError when no JSON content
2015-11-16 10:59:18 +01:00
David Read
c0a865e64e
Revert ok_ - makes it slightly less readable for little benefit.
2015-11-13 13:45:56 +00:00
David Read
42ab55cb6d
No longer need uuid since we clear db between tests now. Added ignore_missing because of occasional failures.
2015-11-13 13:32:55 +00:00
David Read
b150b50887
Move the SkipTest to include inherited tests too.
2015-11-13 12:44:27 +00:00
David Read
01a4bfd314
Patch test should skip if ckan version is wrong, rather than ignore all exceptions from posts of all tests. Remove FunctionalTestBaseWithoutClearBetweenTests now the tests are modernized.
2015-11-13 12:33:18 +00:00
David Read
1288a4d9e7
Reflow text to 79 char width. Warning not necessary with an exception I think.
2015-11-13 12:32:13 +00:00
Stefan Oderbolz
0ce3748153
Do not use ActionError as this does not yet exist in CKAN 2.2
2015-11-13 12:01:19 +01:00
Stefan Oderbolz
c33c6e8c13
Raise an error instead of falling back to harvest_source_update
...
As the behaviour of *_patch is clearly different from the *_update we
should raise an error if this action is called on a CKAN instance, where
the action is not available.
2015-11-13 11:41:53 +01:00
Stefan Oderbolz
644fa49dd4
Make tests independent from cls.sysadmin
...
Generate unique harvest sources
2015-11-11 19:49:49 +01:00
Stefan Oderbolz
ffca5cc3da
Use new factory style for fixtures
...
- Remove default_source_dict from tests
- Replace setup_class with constructor
- Create mixin for harvest source fixture
- Replace assert with assert_equal where appropriate
- Replace assert with ok_
- Remove dependency to global SOURCE_DICT
- General refactoring of tests
2015-11-11 19:07:59 +01:00
Stefan Oderbolz
136fcb87d5
Make sure package_patch has a fallback for package_update on CKAN < 2.3
2015-11-11 11:37:23 +01:00
Stefan Oderbolz
359da2eb69
Add test class for harvest_source_patch
2015-11-11 11:34:01 +01:00
Stefan Oderbolz
3f09010039
Add harvest_source_patch to API
2015-11-11 05:39:29 +01:00
David Read
f0207ad38f
Merge branch 'master' of github.com:ckan/ckanext-harvest into yhteentoimivuuspalvelut-job-reporting-fixes
2015-11-04 09:36:55 +00:00
David Read
f9da3654f8
[ #184 ] Fix tests for older ckan versions.
2015-11-03 23:27:52 +00:00
David Read
5fba056c59
[ #184 ] Add tests
2015-11-03 23:19:05 +00:00
David Read
77e5b89a01
Blank line needed.
2015-11-03 22:23:04 +00:00
David Read
8c1f7619cb
Fix code style to be more ckan-like whilst still pep8.
2015-11-03 22:08:46 +00:00
David Read
20531c0dda
Merge branch 'master' of github.com:ckan/ckanext-harvest into LondonAppDev-master
...
Conflicts:
ckanext/harvest/logic/action/update.py
ckanext/harvest/logic/validators.py
2015-11-03 22:02:49 +00:00
David Read
10685badb5
PEP8 based on #174
...
Conflicts:
ckanext/harvest/logic/action/delete.py
ckanext/harvest/logic/action/update.py
ckanext/harvest/logic/validators.py
2015-11-03 21:56:06 +00:00
David Read
5a5260ff0b
Add test for harvest_source_clear since the PEP8 changes were quite a lot there.
2015-11-03 21:42:39 +00:00
David Read
4f71612002
PEP8 based on #174
2015-11-03 20:30:11 +00:00
Mark Winterbottom
208d1c4185
Setting back to master.
2015-11-03 17:31:00 +00:00
David Read
c7fac36c1c
[ #107 ] "unchanged" response tested and related fixes
...
* fix "existing_package_dict" which wasn't containing metadata_modified (because of the schema in the context) so you never skipped an object.
* fix IntegrityError due to resource revision_id being harvested. No idea why this hasn't caused errors before now.
* "unchanged" is now checked in base instead of ckanharvester - makes sense. Looking at other harvesters, it's normal to return from the import_stage with the value returned from base._create_or_update_package so I've continued with that.
* "unchanged" response is now documented
* better report_status tests in test_queue2.
2015-11-03 00:22:53 +00:00
David Read
e59760fefe
Merge branch 'job-reporting-fixes' of https://github.com/yhteentoimivuuspalvelut/ckanext-harvest into yhteentoimivuuspalvelut-job-reporting-fixes
2015-11-02 21:25:32 +00:00
Mark Winterbottom
7ffd6748f3
Corrected docstring params field, duplicate if statement and deleting keys
...
for blank values.
2015-11-02 16:59:43 +00:00
Mark Winterbottom
443d690ac8
Fixed big typo error.
2015-11-02 16:45:16 +00:00
Mark Winterbottom
53f692b802
Merge remote-tracking branch 'remotes/upstream/master'
2015-11-02 16:00:14 +00:00
Mark Winterbottom
1702cf2f09
Remove ', None' on .get() calls because it's the default value.
2015-11-02 15:51:25 +00:00
Mark Winterbottom
0c19acba78
Changed double quotes to single quotes in docstrings.
2015-11-02 15:50:04 +00:00
Mark Winterbottom
a6069d93db
Fixed bug where the harvest source url validator would validate against
...
all harvest sources that were ever created instead of just sources that
were currently enabled.
2015-10-30 16:59:04 +00:00
Mark Winterbottom
3f37ae5f45
Corrected docstring.
2015-10-30 16:11:25 +00:00
Mark Winterbottom
02b81187df
Fixed bug with deleting harvest source's which have a custom
...
configuration. Added PEP-8 compliance.
2015-10-30 15:15:41 +00:00
Mark Winterbottom
55325f5940
Updated harvest source url validator to allow for duplicate URL's with
...
unique configs.
2015-10-30 11:59:24 +00:00
Mark Winterbottom
2c41293c9c
Updated the validator to check for unique sets as well as URL.
2015-10-29 18:30:51 +00:00
Mark Winterbottom
39ce744368
Modified to make PEP-8 compliant.
2015-10-29 17:18:51 +00:00
David Read
421e6da660
Add run_test, job_abort, source commands
...
* run_test - for running a whole harvest on the command-line
* job_abort - for aborting a limbo job
* source - for showing a single harvest source
* allowing a source to be specified by name in several commands
2015-10-28 17:51:58 +00:00
amercader
86630adab7
Merge branch 'include-exclude-org'
2015-10-27 15:52:55 +00:00
amercader
24574f485b
Setup harvest model in harvester tests
2015-10-23 15:43:01 +01:00
David Read
bc49149d5e
Merge branch 'master' into include-exclude-org
2015-10-23 14:36:53 +01:00
amercader
2f4adfb338
Merge branch 'tests'
2015-10-23 13:18:15 +01:00
amercader
3c6cc55be0
Only flush keys on the current Redis database
2015-10-23 11:52:22 +01:00
amercader
fdbade465f
Merge branch 'master' into purge
2015-10-23 11:33:43 +01:00
amercader
d950b13400
Merge branch 'unique-names-improved'
2015-10-23 11:02:49 +01:00
amercader
501edffe2d
Merge branch 'master' into migration-states
2015-10-23 10:59:04 +01:00
David Read
3e4a9933ce
Remove prints.
2015-10-21 16:52:19 +00:00