Fix order of arguments in assertEqual

Some tests used incorrect order assertEqual(observed, expected).
The correct order expected by testtools is
assertEqual(expected, observed).

Change-Id: I582fc1d4080456a85a635c477046876d1d2f4363
Partial-Bug: #1259292

tests/functional/test_functional.py

@@ -530,5 +530,5 @@ class FunctionalTests(testtools.TestCase):
 
         self.b_mgr.populate_baseline(json)
         self.run_example('flask_debug.py')
-        self.assertEqual(len(self.b_mgr.baseline), 1)
-        self.assertEqual(self.b_mgr.get_issue_list(), {})
+        self.assertEqual(1, len(self.b_mgr.baseline))
+        self.assertEqual({}, self.b_mgr.get_issue_list())

tests/unit/cli/test_baseline.py

@@ -117,8 +117,8 @@ class BanditBaselineToolTests(testtools.TestCase):
             git_repo.index.add(branch['files'])
             git_repo.index.commit(branch['name'])
 
-            self.assertEqual(subprocess.call(baseline_command),
-                             branch['expected_return'])
+            self.assertEqual(branch['expected_return'],
+                             subprocess.call(baseline_command))
 
     def test_main_non_repo(self):
         # Test that bandit gracefully exits when there is no git repository
@@ -202,7 +202,7 @@ class BanditBaselineToolTests(testtools.TestCase):
         return_value = baseline.initialize()
 
         # assert bandit did not run due to no git repo
-        self.assertEqual(return_value, (None, None, None))
+        self.assertEqual((None, None, None), return_value)
 
     def test_initialize_git_command_failure(self):
         # Test that bandit does not run when the Git command fails
@@ -223,7 +223,7 @@ class BanditBaselineToolTests(testtools.TestCase):
             return_value = baseline.initialize()
 
             # assert bandit did not run due to git command failure
-            self.assertEqual(return_value, (None, None, None))
+            self.assertEqual((None, None, None), return_value)
 
     def test_initialize_dirty_repo(self):
         # Test that bandit does not run when the current git repository is
@@ -241,7 +241,7 @@ class BanditBaselineToolTests(testtools.TestCase):
         return_value = baseline.initialize()
 
         # assert bandit did not run due to dirty repo
-        self.assertEqual(return_value, (None, None, None))
+        self.assertEqual((None, None, None), return_value)
 
     @patch('sys.argv', ['bandit', '-f', 'txt', 'test'])
     def test_initialize_existing_report_file(self):
@@ -261,7 +261,7 @@ class BanditBaselineToolTests(testtools.TestCase):
         return_value = baseline.initialize()
 
         # assert bandit did not run due to existing report file
-        self.assertEqual(return_value, (None, None, None))
+        self.assertEqual((None, None, None), return_value)
 
     @patch('bandit.cli.baseline.bandit_args', ['-o',
            'bandit_baseline_result'])
@@ -276,7 +276,7 @@ class BanditBaselineToolTests(testtools.TestCase):
         return_value = baseline.initialize()
 
         # assert bandit did not run due to provided -o (--ouput) argument
-        self.assertEqual(return_value, (None, None, None))
+        self.assertEqual((None, None, None), return_value)
 
     def test_initialize_existing_temp_file(self):
         # Test that bandit does not run when the temporary output file exists
@@ -294,4 +294,4 @@ class BanditBaselineToolTests(testtools.TestCase):
         return_value = baseline.initialize()
 
         # assert bandit did not run due to existing temporary report file
-        self.assertEqual(return_value, (None, None, None))
+        self.assertEqual((None, None, None), return_value)

tests/unit/core/test_issue.py

@@ -40,14 +40,14 @@ class IssueTests(testtools.TestCase):
         test_issue = _get_issue_instance()
         test_issue_dict = test_issue.as_dict(with_code=False)
         self.assertIsInstance(test_issue_dict, dict)
-        self.assertEqual(test_issue_dict['filename'], 'code.py')
-        self.assertEqual(test_issue_dict['test_name'], 'bandit_plugin')
-        self.assertEqual(test_issue_dict['test_id'], 'B999')
-        self.assertEqual(test_issue_dict['issue_severity'], 'MEDIUM')
-        self.assertEqual(test_issue_dict['issue_confidence'], 'MEDIUM')
-        self.assertEqual(test_issue_dict['issue_text'], 'Test issue')
-        self.assertEqual(test_issue_dict['line_number'], 1)
-        self.assertEqual(test_issue_dict['line_range'], [])
+        self.assertEqual('code.py', test_issue_dict['filename'])
+        self.assertEqual('bandit_plugin', test_issue_dict['test_name'])
+        self.assertEqual('B999', test_issue_dict['test_id'])
+        self.assertEqual('MEDIUM', test_issue_dict['issue_severity'])
+        self.assertEqual('MEDIUM', test_issue_dict['issue_confidence'])
+        self.assertEqual('Test issue', test_issue_dict['issue_text'])
+        self.assertEqual(1, test_issue_dict['line_number'])
+        self.assertEqual([], test_issue_dict['line_range'])
 
     def test_issue_filter_severity(self):
         levels = [bandit.LOW, bandit.MEDIUM, bandit.HIGH]