X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=blobdiff_plain;f=tests%2Futils.py;h=d6c5b20ac7882281d4958e99e3dbcd6a35de708b;hb=9c62e1b0e5c30ed3fd7a49828749db195bc3e557;hp=86d049dac2387b97f441d228ecc3c33e9bfe6552;hpb=8c04dfb85e29c7bb68f1bfafdd3093493a7c5063;p=plomtask diff --git a/tests/utils.py b/tests/utils.py index 86d049d..d6c5b20 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -274,22 +274,23 @@ class TestCaseWithServer(TestCaseWithDB): """Compare JSON on GET path with expected. To simplify comparison of VersionedAttribute histories, transforms - keys under "history"-named dicts into bracketed integer strings - counting upwards in chronology. + timestamp keys of VersionedAttribute history keys into integers + counting chronologically forward from 0. """ def rewrite_history_keys_in(item: Any) -> Any: if isinstance(item, dict): - if 'history' in item.keys(): - vals = item['history'].values() - history = {} - for i, val in enumerate(vals): - history[f'[{i}]'] = val - item['history'] = history + if '_versioned' in item.keys(): + for k in item['_versioned']: + vals = item['_versioned'][k].values() + history = {} + for i, val in enumerate(vals): + history[i] = val + item['_versioned'][k] = history for k in list(item.keys()): rewrite_history_keys_in(item[k]) elif isinstance(item, list): item[:] = [rewrite_history_keys_in(i) for i in item] - return item + return item self.conn.request('GET', path) response = self.conn.getresponse() self.assertEqual(response.status, 200)