[AIRFLOW-857] Use library assert statements instead of conditionals

Testing Done: - Travis Closes apache#2062 from saguziel/aguziel-fix-asserts
RedOakMark · Feb 10, 2017 · 3ceb3ab · 3ceb3ab
1 parent b56e642
commit 3ceb3ab
Show file tree

Hide file tree

Showing 15 changed files with 268 additions and 268 deletions.
diff --git a/tests/contrib/hooks/test_jira_hook.py b/tests/contrib/hooks/test_jira_hook.py
@@ -42,7 +42,7 @@ def setUp(self):
     def test_jira_client_connection(self, jira_mock):
         jira_hook = JiraHook()
 
-        assert jira_mock.called
+        self.assertTrue(jira_mock.called)
         self.assertIsInstance(jira_hook.client, Mock)
         self.assertEqual(jira_hook.client.name, jira_mock.return_value.name)
 

diff --git a/tests/contrib/operators/dataflow_operator.py b/tests/contrib/operators/dataflow_operator.py
@@ -69,7 +69,7 @@ def test_exec(self, gcs_hook, dataflow_mock):
         start_python_hook = dataflow_mock.return_value.start_python_dataflow
         gcs_download_hook = gcs_hook.return_value.download
         self.dataflow.execute(None)
-        assert dataflow_mock.called
+        self.assertTrue(dataflow_mock.called)
         expected_options = {
             'project': 'test',
             'staging_location': 'gs://test/staging',

diff --git a/tests/contrib/operators/jira_operator_test.py b/tests/contrib/operators/jira_operator_test.py
@@ -74,8 +74,8 @@ def test_issue_search(self, jira_mock):
         jira_ticket_search_operator.run(start_date=DEFAULT_DATE,
                                         end_date=DEFAULT_DATE, ignore_ti_state=True)
 
-        assert jira_mock.called
-        assert jira_mock.return_value.search_issues.called
+        self.assertTrue(jira_mock.called)
+        self.assertTrue(jira_mock.return_value.search_issues.called)
 
     @patch("airflow.contrib.hooks.jira_hook.JIRA",
            autospec=True, return_value=jira_client_mock)
@@ -93,8 +93,8 @@ def test_update_issue(self, jira_mock):
         add_comment_operator.run(start_date=DEFAULT_DATE,
                                  end_date=DEFAULT_DATE, ignore_ti_state=True)
 
-        assert jira_mock.called
-        assert jira_mock.return_value.add_comment.called
+        self.assertTrue(jira_mock.called)
+        self.assertTrue(jira_mock.return_value.add_comment.called)
 
 
 if __name__ == '__main__':

diff --git a/tests/contrib/sensors/hdfs_sensors.py b/tests/contrib/sensors/hdfs_sensors.py
@@ -248,4 +248,4 @@ def test_should_match_regex_but_copyingext(self):
         # When
         # Then
         with self.assertRaises(AirflowSensorTimeout):
-            task.execute(None)
+            task.execute(None)
diff --git a/tests/contrib/sensors/jira_sensor_test.py b/tests/contrib/sensors/jira_sensor_test.py
@@ -73,8 +73,8 @@ def test_issue_label_set(self, jira_mock):
         ticket_label_sensor.run(start_date=DEFAULT_DATE,
                                 end_date=DEFAULT_DATE, ignore_ti_state=True)
 
-        assert jira_mock.called
-        assert jira_mock.return_value.issue.called
+        self.assertTrue(jira_mock.called)
+        self.assertTrue(jira_mock.return_value.issue.called)
 
     @staticmethod
     def field_checker_func(context, issue):