Update tests based on feedback

aws · Oct 13, 2014 · 5002f0c · 5002f0c
1 parent 9f56e8f
commit 5002f0c
Showing 1 changed file with 16 additions and 25 deletions.
diff --git a/tests/unit/customizations/test_commands.py b/tests/unit/customizations/test_commands.py
@@ -37,30 +37,21 @@ def setUp(self):
         self.command = BasicCommand(self.session)
 
     def test_load_arg_table_property(self):
-        with mock.patch('awscli.customizations.commands.BasicCommand.'
-                        '_build_arg_table') as mock_build_arg_table:
-            mock_build_arg_table.return_value = mock.Mock()
-            # Ensure ``_build_arg_table()`` is called if it has not been
-            # built via the ``arg_table`` property.
-            self.command.arg_table
-            self.assertEqual(len(mock_build_arg_table.call_args_list), 1)
-            # Ensure the ``arg_table`` is not built again if ``arg_table``
-            # property is called again.
-            self.command.arg_table
-            self.assertEqual(len(mock_build_arg_table.call_args_list), 1)
+        # Ensure ``_build_arg_table()`` is called if it has not been
+        # built via the ``arg_table`` property.  It should be an empty
+        # dictionary.
+        orig_arg_table = self.command.arg_table
+        self.assertEqual(orig_arg_table, {})
+        # Ensure the ``arg_table`` is not built again if
+        # ``arg_table`` property is called again.
+        self.assertIs(orig_arg_table, self.command.arg_table)
 
     def test_load_subcommand_table_property(self):
-        with mock.patch('awscli.customizations.commands.BasicCommand.'
-                        '_build_subcommand_table') as \
-                mock_build_subcommand_table:
-            mock_build_subcommand_table.return_value = mock.Mock()
-            # Ensure ``_build_subcommand_table()`` is called if it has not
-            # been built via the ``subcommand_table`` property.
-            self.command.subcommand_table
-            self.assertEqual(
-                len(mock_build_subcommand_table.call_args_list), 1)
-            # Ensure the ``subcommand_table`` is not built again if 
-            # ``subcommand_table`` property is called again.
-            self.command.subcommand_table
-            self.assertEqual(
-                len(mock_build_subcommand_table.call_args_list), 1)
+        # Ensure ``_build_subcommand_table()`` is called if it has not
+        # been built via the ``subcommand_table`` property. It should be
+        # an empty dictionary.
+        orig_subcommand_table = self.command.subcommand_table
+        self.assertEqual(orig_subcommand_table, {})
+        # Ensure the ``subcommand_table`` is not built again if
+        # ``subcommand_table`` property is called again.
+        self.assertIs(orig_subcommand_table, self.command.subcommand_table)