Make only the final test classes derive from ScriptsRepoMixin

This allows for more mixing of the mixins...

Author: barisione

tests/mixin_scripts_repo.py

@@ -97,7 +97,7 @@ def write_style(self, style_dict):
         self.repo.write_file('.clang-format', content)
 
 
-class CloneRepoMixin(ScriptsRepoMixin):
+class CloneRepoMixin():
     '''
     A mixin representing a git repository cloned from this git repository.
     '''
@@ -110,7 +110,7 @@ def clone_this_repo(self):
         return self.clone_repo(self.this_repo_path())
 
 
-class SubmoduleMixin(ScriptsRepoMixin):
+class SubmoduleMixin():
     '''
     A mixin representing a git repository in which this git repository is added as a submodule.
     '''
@@ -128,7 +128,7 @@ def new_repo_with_submodule(self):
         return repo
 
 
-class CopiedFilesMixin(ScriptsRepoMixin):
+class CopiedFilesMixin():
     '''
     A mixin representing a git repository in which the scripts from this git repository are
     directly copied.

tests/test_apply_format.py

@@ -15,7 +15,7 @@
     )
 
 
-class FormatTestCaseBase(ScriptsRepoMixin):
+class FormatTestCaseBase():
     '''
     Test the apply-format script.
     '''
@@ -275,18 +275,21 @@ def test_whole_file(self):
 
 
 class FormatClonedTestCase(CloneRepoMixin,
+                           ScriptsRepoMixin,
                            FormatTestCaseBase,
                            unittest.TestCase):
     pass
 
 
 class FormatSubmoduleTestCase(SubmoduleMixin,
+                              ScriptsRepoMixin,
                               FormatTestCaseBase,
                               unittest.TestCase):
     pass
 
 
 class FormatCopiedScriptsTestCase(CopiedFilesMixin,
+                                  ScriptsRepoMixin,
                                   FormatTestCaseBase,
                                   unittest.TestCase):
     pass

tests/test_hook.py

@@ -18,7 +18,8 @@
     CopiedFilesMixin,
     )
 
-class HookTestCaseBase(ScriptsRepoMixin):
+
+class HookTestCaseBase():
     '''
     Test the git hook script.
     '''
@@ -206,18 +207,21 @@ def test_install_from_scripts_dir(self):
 
 
 class HookClonedTestCase(CloneRepoMixin,
+                         ScriptsRepoMixin,
                          HookTestCaseBase,
                          unittest.TestCase):
     pass
 
 
 class HookSubmoduleTestCase(SubmoduleMixin,
+                            ScriptsRepoMixin,
                             HookTestCaseBase,
                             unittest.TestCase):
     pass
 
 
 class HookCopiedScriptsTestCase(CopiedFilesMixin,
+                                ScriptsRepoMixin,
                                 HookTestCaseBase,
                                 unittest.TestCase):
     pass