diff --git a/beat/web/experiments/tests.py b/beat/web/experiments/tests.py index 413b243d637082847c847999a2a7e9273f3b1f8b..d2ad2e43b4c8ecfb642df38195bde123773b3b92 100755 --- a/beat/web/experiments/tests.py +++ b/beat/web/experiments/tests.py @@ -1174,13 +1174,13 @@ class ResultsAPI(ExperimentTestBase): self.assertEqual(data['blocks_status']['analysis'], 'pending') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) + self.assertTrue('out_float' in result) self.assertEqual(result['out_float']['type'], 'float32') self.assertTrue(result['out_float']['value'] is None) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_text' in result) self.assertEqual(result['out_text']['type'], 'string') self.assertTrue(result['out_text']['value'] is None) @@ -1212,13 +1212,13 @@ class ResultsAPI(ExperimentTestBase): self.assertEqual(data['blocks_status']['analysis'], 'pending') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) + self.assertTrue('out_float' in result) self.assertEqual(result['out_float']['type'], 'float32') self.assertTrue(result['out_float']['value'] is None) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_text' in result) self.assertEqual(result['out_text']['type'], 'string') self.assertTrue(result['out_text']['value'] is None) @@ -1252,7 +1252,7 @@ class ResultsAPI(ExperimentTestBase): self.assertEqual(data['blocks_status']['analysis'], 'generated') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) self.assertTrue(data['attestation'] is None) @@ -1289,14 +1289,14 @@ class ResultsAPI(ExperimentTestBase): self.assertEqual(data['blocks_status']['analysis'], 'pending') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) + self.assertTrue('out_float' in result) self.assertEqual(result['out_float']['type'], 'float32') self.assertTrue(result['out_float']['value'] is None) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_text' in result) self.assertEqual(result['out_text']['type'], 'string') self.assertTrue(result['out_text']['value'] is None) @@ -1344,7 +1344,7 @@ class ResultsAPI(ExperimentTestBase): self.assertEqual(data['blocks_status']['analysis'], 'generated') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) self.assertEqual(data['attestation'], 123456) @@ -1382,14 +1382,14 @@ class ResultsAPI(ExperimentTestBase): data = self.checkResponse(response, 200, content_type='application/json') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) + self.assertTrue('out_float' in result) self.assertEqual(result['out_float']['type'], 'float32') self.assertEqual(result['out_float']['value'], 1.0) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_text' in result) self.assertEqual(result['out_text']['type'], 'string') self.assertEqual(result['out_text']['value'], "Hello world!\nTrain error: 0.2\nTest error: 0.3") @@ -1435,14 +1435,14 @@ class ResultsAPI(ExperimentTestBase): data = self.checkResponse(response, 200, content_type='application/json') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) + self.assertTrue('out_float' in result) self.assertEqual(result['out_float']['type'], 'float32') self.assertEqual(result['out_float']['value'], 1.0) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_text' in result) self.assertEqual(result['out_text']['type'], 'string') self.assertEqual(result['out_text']['value'], "Hello world!\nTrain error: 0.2\nTest error: 0.3") @@ -1454,7 +1454,7 @@ class ResultsAPI(ExperimentTestBase): data = self.checkResponse(response, 200, content_type='application/json') - self.assertFalse(data.has_key('started')) + self.assertFalse('started' in data) self.assertEqual(data['done'], False) @@ -1464,11 +1464,11 @@ class ResultsAPI(ExperimentTestBase): self.assertEqual(data['blocks_status']['analysis'], 'pending') self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_float' in result) + self.assertTrue('out_text' in result) def test_no_done_field(self): @@ -1478,7 +1478,7 @@ class ResultsAPI(ExperimentTestBase): data = self.checkResponse(response, 200, content_type='application/json') - self.assertFalse(data.has_key('done')) + self.assertFalse('done' in data) self.assertEqual(data['started'], False) @@ -1490,8 +1490,8 @@ class ResultsAPI(ExperimentTestBase): self.assertEqual(len(data['results']), 1) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_float' in result) + self.assertTrue('out_text' in result) def test_no_blocks_status_field(self): @@ -1501,17 +1501,17 @@ class ResultsAPI(ExperimentTestBase): data = self.checkResponse(response, 200, content_type='application/json') - self.assertFalse(data.has_key('blocks_status')) + self.assertFalse('blocks_status' in data) self.assertEqual(data['started'], False) self.assertEqual(data['done'], False) self.assertEqual(len(data['results']), 1) - self.assertTrue(data['results'].has_key('analysis')) + self.assertTrue('analysis' in data['results']) result = data['results']['analysis'] - self.assertTrue(result.has_key('out_float')) - self.assertTrue(result.has_key('out_text')) + self.assertTrue('out_float' in result) + self.assertTrue('out_text' in result) def test_no_results_field(self): @@ -1521,7 +1521,7 @@ class ResultsAPI(ExperimentTestBase): data = self.checkResponse(response, 200, content_type='application/json') - self.assertFalse(data.has_key('results')) + self.assertFalse('results' in data) self.assertEqual(data['started'], False) self.assertEqual(data['done'], False)