Tests and flake8 fix.

lib/spack/spack/build_systems/cmake.py

@@ -134,7 +134,8 @@ def _std_args(pkg):
         if primary_generator not in valid_generators:
             msg  = "Invalid CMake generator: '{0}'\n".format(generator)
             msg += "CMakePackage currently supports the following "
-            msg += "primary generators: '{0}'".format("', '".join(valid_generators))
+            msg += "primary generators: '{0}'".\
+                   format("', '".join(valid_generators))
             raise InstallError(msg)
 
         try:

lib/spack/spack/test/build_systems.py

@@ -134,6 +134,27 @@ def test_cmake_std_args(config, mock_packages):
     assert get_std_cmake_args(pkg)
 
 
+def test_cmake_bad_generator(config, mock_packages):
+    s = Spec('cmake-client')
+    s.concretize()
+    pkg = spack.repo.get(s)
+    pkg.generator = 'Yellow Sticky Notes'
+    try:
+        get_std_cmake_args(pkg)
+    except spack.package.InstallError as e:
+        return e
+    else:
+        pytest.fail('InstallError was not raised!')
+
+
+def test_cmake_secondary_generator(config, mock_packages):
+    s = Spec('cmake-client')
+    s.concretize()
+    pkg = spack.repo.get(s)
+    pkg.generator = 'CodeBlocks - Unix Makefiles'
+    assert get_std_cmake_args(pkg)
+
+
 @pytest.mark.usefixtures('config', 'mock_packages')
 class TestAutotoolsPackage(object):