|
@@ -21,64 +21,81 @@ def test_get_type_address(set_test_db):
|
21
|
21
|
except HTTPException as e:
|
22
|
22
|
assert e.status_code == 404
|
23
|
23
|
|
24
|
|
- r = c.get('/A/11')
|
25
|
|
- d_resp = r.content.decode()
|
26
|
|
- assert float(d_resp) == -0.6
|
|
24
|
+ try:
|
|
25
|
+ r = c.get('/A/11')
|
|
26
|
+ d_resp = r.content.decode()
|
|
27
|
+ assert float(d_resp) == -0.6
|
27
|
28
|
|
28
|
29
|
|
29
|
|
- r = c.get('/A/12')
|
30
|
|
- d_resp = r.content.decode()
|
31
|
|
- assert float(d_resp) == 3200.0
|
|
30
|
+ r = c.get('/A/12')
|
|
31
|
+ d_resp = r.content.decode()
|
|
32
|
+ assert float(d_resp) == 3200.0
|
32
|
33
|
|
33
|
34
|
|
34
|
|
- r = c.get('/A/14')
|
35
|
|
- d_resp = r.content.decode()
|
36
|
|
- assert float(d_resp) == -2353.6
|
|
35
|
+ r = c.get('/A/14')
|
|
36
|
+ d_resp = r.content.decode()
|
|
37
|
+ assert float(d_resp) == -2353.6
|
37
|
38
|
|
38
|
39
|
|
39
|
|
- r = c.get('/A/17')
|
40
|
|
- d_resp = r.content.decode()
|
41
|
|
- assert float(d_resp) == -2953.6
|
|
40
|
+ r = c.get('/A/17')
|
|
41
|
+ d_resp = r.content.decode()
|
|
42
|
+ assert float(d_resp) == -2953.6
|
42
|
43
|
|
43
|
44
|
|
44
|
|
- r = c.get('/A/10/{}'.format(
|
45
|
|
- (datetime.now() - timedelta(days=1)).isoformat()
|
46
|
|
- ))
|
47
|
|
- d_resp = r.content.decode()
|
48
|
|
- assert float(d_resp) == 0
|
|
45
|
+ r = c.get('/A/10/{}'.format(
|
|
46
|
+ (datetime.now() - timedelta(days=1)).isoformat()
|
|
47
|
+ ))
|
|
48
|
+ d_resp = r.content.decode()
|
|
49
|
+ assert float(d_resp) == 0
|
49
|
50
|
|
50
|
|
- r = c.get('/A/10/{}'.format(
|
51
|
|
- (datetime.now() - timedelta(days=2)).isoformat()
|
52
|
|
- ))
|
53
|
|
- d_resp = r.content.decode()
|
54
|
|
- assert float(d_resp) == 0
|
|
51
|
+ r = c.get('/A/10/{}'.format(
|
|
52
|
+ (datetime.now() - timedelta(days=2)).isoformat()
|
|
53
|
+ ))
|
|
54
|
+ d_resp = r.content.decode()
|
|
55
|
+ assert float(d_resp) == 0
|
55
|
56
|
|
56
|
|
- r = c.get('/A/10/{}'.format(
|
57
|
|
- (datetime.now() - timedelta(days=2)).isoformat()
|
58
|
|
- ))
|
59
|
|
- d_resp = r.content.decode()
|
60
|
|
- assert float(d_resp) == 0
|
|
57
|
+ r = c.get('/A/10/{}'.format(
|
|
58
|
+ (datetime.now() - timedelta(days=2)).isoformat()
|
|
59
|
+ ))
|
|
60
|
+ d_resp = r.content.decode()
|
|
61
|
+ assert float(d_resp) == 0
|
61
|
62
|
|
62
|
63
|
|
63
|
|
- r = c.get('/I/5010')
|
64
|
|
- d_resp = r.content.decode()
|
65
|
|
- assert int(d_resp) == 42
|
|
64
|
+ r = c.get('/I/5010')
|
|
65
|
+ d_resp = r.content.decode()
|
|
66
|
+ assert int(d_resp) == 42
|
66
|
67
|
|
67
|
|
- r = c.get('/I/5011')
|
68
|
|
- d_resp = r.content.decode()
|
69
|
|
- assert int(d_resp) == 24
|
|
68
|
+ r = c.get('/I/5011')
|
|
69
|
+ d_resp = r.content.decode()
|
|
70
|
+ assert int(d_resp) == 24
|
70
|
71
|
|
71
|
|
- r = c.get('/I/5010/{}'.format(
|
72
|
|
- (datetime.now() - timedelta(hours=1)).isoformat()
|
73
|
|
- ))
|
74
|
|
- d_resp = r.content.decode()
|
75
|
|
- assert int(d_resp) == 20
|
|
72
|
+ r = c.get('/I/5010/{}'.format(
|
|
73
|
+ (datetime.now() - timedelta(hours=1)).isoformat()
|
|
74
|
+ ))
|
|
75
|
+ d_resp = r.content.decode()
|
|
76
|
+ assert int(d_resp) == 20
|
|
77
|
+
|
|
78
|
+ r = c.get('/I/5010/{}'.format(
|
|
79
|
+ (datetime.now() - timedelta(hours=2)).isoformat()
|
|
80
|
+ ))
|
|
81
|
+ d_resp = r.content.decode()
|
|
82
|
+ assert int(d_resp) == 0
|
|
83
|
+
|
|
84
|
+ r = c.get('/D/10')
|
|
85
|
+ d_resp = r.content.decode()
|
|
86
|
+ assert d_resp == 'True'
|
|
87
|
+
|
|
88
|
+ r = c.get('/D/11')
|
|
89
|
+ d_resp = r.content.decode()
|
|
90
|
+ assert d_resp == 'True'
|
|
91
|
+
|
|
92
|
+ r = c.get('/D/12')
|
|
93
|
+ d_resp = r.content.decode()
|
|
94
|
+ assert d_resp == 'False'
|
|
95
|
+ except AssertionError as exc:
|
|
96
|
+ print(d_resp)
|
|
97
|
+ raise exc
|
76
|
98
|
|
77
|
|
- r = c.get('/I/5010/{}'.format(
|
78
|
|
- (datetime.now() - timedelta(hours=2)).isoformat()
|
79
|
|
- ))
|
80
|
|
- d_resp = r.content.decode()
|
81
|
|
- assert int(d_resp) == 0
|
82
|
99
|
|
83
|
100
|
|
84
|
101
|
@pytest.mark.skip
|