Fix tests

The added EC and EasyBlock requires changes to the expected output in
some tests.

Author: Flamefire

test/framework/docs.py

@@ -44,6 +44,7 @@
 
 LIST_EASYBLOCKS_SIMPLE_TXT = """EasyBlock
 |-- bar
+|-- Cargo
 |-- ConfigureMake
 |   |-- MakeCp
 |-- EB_EasyBuildMeta
@@ -76,6 +77,7 @@
 
 LIST_EASYBLOCKS_DETAILED_TXT = """EasyBlock (easybuild.framework.easyblock)
 |-- bar (easybuild.easyblocks.generic.bar @ %(topdir)s/generic/bar.py)
+|-- Cargo (easybuild.easyblocks.generic.cargo @ %(topdir)s/generic/cargo.py)
 |-- ConfigureMake (easybuild.easyblocks.generic.configuremake @ %(topdir)s/generic/configuremake.py)
 |   |-- MakeCp (easybuild.easyblocks.generic.makecp @ %(topdir)s/generic/makecp.py)
 |-- EB_EasyBuildMeta (easybuild.easyblocks.easybuildmeta @ %(topdir)s/e/easybuildmeta.py)
@@ -109,6 +111,7 @@
 LIST_EASYBLOCKS_SIMPLE_RST = """* **EasyBlock**
 
   * bar
+  * Cargo
   * ConfigureMake
 
     * MakeCp
@@ -157,6 +160,7 @@
 LIST_EASYBLOCKS_DETAILED_RST = """* **EasyBlock** (easybuild.framework.easyblock)
 
   * bar (easybuild.easyblocks.generic.bar @ %(topdir)s/generic/bar.py)
+  * Cargo (easybuild.easyblocks.generic.cargo @ %(topdir)s/generic/cargo.py)
   * ConfigureMake (easybuild.easyblocks.generic.configuremake @ %(topdir)s/generic/configuremake.py)
 
     * MakeCp (easybuild.easyblocks.generic.makecp @ %(topdir)s/generic/makecp.py)
@@ -204,6 +208,7 @@
 
 LIST_EASYBLOCKS_SIMPLE_MD = """- **EasyBlock**
   - bar
+  - Cargo
   - ConfigureMake
     - MakeCp
   - EB_EasyBuildMeta
@@ -236,6 +241,7 @@
 
 LIST_EASYBLOCKS_DETAILED_MD = """- **EasyBlock** (easybuild.framework.easyblock)
   - bar (easybuild.easyblocks.generic.bar @ %(topdir)s/generic/bar.py)
+  - Cargo (easybuild.easyblocks.generic.cargo @ %(topdir)s/generic/cargo.py)
   - ConfigureMake (easybuild.easyblocks.generic.configuremake @ %(topdir)s/generic/configuremake.py)
     - MakeCp (easybuild.easyblocks.generic.makecp @ %(topdir)s/generic/makecp.py)
   - EB_EasyBuildMeta (easybuild.easyblocks.easybuildmeta @ %(topdir)s/e/easybuildmeta.py)
@@ -513,7 +519,7 @@ def test_get_easyblock_classes(self):
         # result should correspond with test easyblocks in test/framework/sandbox/easybuild/easyblocks/generic
         eb_classes = get_easyblock_classes('easybuild.easyblocks.generic')
         eb_names = [x.__name__ for x in eb_classes]
-        expected = ['ConfigureMake', 'DummyExtension', 'MakeCp', 'ModuleRC',
+        expected = ['Cargo', 'ConfigureMake', 'DummyExtension', 'MakeCp', 'ModuleRC',
                     'PythonBundle', 'Toolchain', 'Toy_Extension', 'bar']
         self.assertEqual(sorted(eb_names), expected)
 
@@ -724,6 +730,7 @@ def test_list_software(self):
             'homepage: https://easybuilders.github.io/easybuild',
             '',
             "  * toy v0.0: gompi/2018a, system",
+            "  * toy v0.0 (versionsuffix: '-cargo'): system",
             "  * toy v0.0 (versionsuffix: '-deps'): system",
             "  * toy v0.0 (versionsuffix: '-iter'): system",
             "  * toy v0.0 (versionsuffix: '-multiple'): system",
@@ -746,6 +753,7 @@ def test_list_software(self):
             'version    versionsuffix    toolchain',
             '=======    =============    ===========================',
             '``0.0``                     ``gompi/2018a``, ``system``',
+            '``0.0``    ``-cargo``       ``system``',
             '``0.0``    ``-deps``        ``system``',
             '``0.0``    ``-iter``        ``system``',
             '``0.0``    ``-multiple``    ``system``',

test/framework/filetools.py

@@ -2470,11 +2470,13 @@ def test_index_functions(self):
         # load_index just returns None if there is no index in specified directory
         self.assertEqual(ft.load_index(self.test_prefix), None)
 
+        num_files = len(glob.glob(test_ecs + '/**/*.*', recursive=True))
+
         # create index for test easyconfigs;
         # test with specified path with and without trailing '/'s
         for path in [test_ecs, test_ecs + '/', test_ecs + '//']:
             index = ft.create_index(path)
-            self.assertEqual(len(index), 92)
+            self.assertEqual(len(index), num_files)
 
             expected = [
                 os.path.join('b', 'bzip2', 'bzip2-1.0.6-GCC-4.9.2.eb'),

test/framework/options.py

@@ -951,6 +951,7 @@ def test_000_list_easyblocks(self):
             expected = '\n'.join([
                 r'EasyBlock',
                 r'\|-- bar',
+                r'\|-- Cargo',
                 r'\|-- ConfigureMake',
                 r'\|   \|-- MakeCp',
                 r'\|-- EB_EasyBuildMeta',