airbnb / airflow / 7706

69%

master: 0%

Build Type

push

travis-ci

Committed by Bolke de Bruin

Commit Message

<a href="https://github.com/airbnb/airflow/commit/<a class=hub.com/airbnb/airflow/commit/6069075a7523794f626148b99992687e56e447b8">6069075a7<a href="https://github.com/airbnb/airflow/commit/6069075a7523794f626148b99992687e56e447b8">&quot;&gt;[AIRFLOW-1177] Fix Variable.setdefault w/existing JSON

Previously due to a logic error if you attempt to
use
`Variable.setdefault()` with
`deserialize_json=True` and the value
already existed it would die with:

    ...
        my = Variable.setdefault(&amp;#39;regions&amp;#39;, [&amp;#39;uk&amp;#39;],
deserialize_json=True)
      File &amp;quot;/usr/local/lib/python3.5/site-
packages/airflow/models.py&amp;quot;, line 3623, in
setdefault
        return json.loads(obj.val)
    AttributeError: &amp;#39;str&amp;#39; object has no attribute
&amp;#39;val&amp;#39;

The problem was that the `Variable.get()` call was
returning the value,
not a variable object.

Closes #2540 from ashb/variable-setdefault-json

(cherry picked from commit </a><a class="double-link" href="https://github.com/airbnb/airflow/commit/<a class="double-link" href="https://github.com/airbnb/airflow/commit/610f68b22a8277f9521d0b9989b4dd5ce7cbcfe0">610f68b22</a>">610f68b22</a><a href="https://github.com/airbnb/airflow/commit/6069075a7523794f626148b99992687e56e447b8">)
Signed-off-by: Bolke de Bruin <bolke@xs4all.nl>

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

7420 of 10809 relevant lines covered (68.65%)

4.09 hits per line